Use ImportsFiles consistently.

Author: bd1976bris

llvm/lib/LTO/LTO.cpp

@@ -1419,10 +1419,10 @@ Error ThinBackendProc::emitFiles(
                    &DeclarationSummaries);
 
   if (ShouldEmitImportsFiles) {
-    Error ImportFilesError = EmitImportsFiles(
+    Error ImportsFilesError = EmitImportsFiles(
         ModulePath, NewModulePath + ".imports", ModuleToSummariesForIndex);
-    if (ImportFilesError)
-      return ImportFilesError;
+    if (ImportsFilesError)
+      return ImportsFilesError;
   }
 
   // Optionally, store the imports files.
@@ -2215,7 +2215,7 @@ class OutOfProcessThinBackend : public CGThinBackend {
     StringRef ModuleID;
     StringRef NativeObjectPath;
     StringRef SummaryIndexPath;
-    ImportsFilesContainer ImportFiles;
+    ImportsFilesContainer ImportsFiles;
   };
   // The set of backend compilations jobs.
   SmallVector<Job> Jobs;
@@ -2278,7 +2278,7 @@ class OutOfProcessThinBackend : public CGThinBackend {
     BackendThreadPool.async(
         [=](Job &J, const FunctionImporter::ImportMapTy &ImportList) {
           if (auto E = emitFiles(ImportList, J.ModuleID, J.SummaryIndexPath,
-                                 J.ModuleID.str(), J.ImportFiles)) {
+                                 J.ModuleID.str(), J.ImportsFiles)) {
             std::unique_lock<std::mutex> L(ErrMu);
             if (Err)
               Err = joinErrors(std::move(*Err), std::move(E));
@@ -2397,7 +2397,7 @@ class OutOfProcessThinBackend : public CGThinBackend {
             // Add the bitcode files from which imports will be made. These do
             // not explicitly appear on the backend compilation command lines
             // but are recorded in the summary index shards.
-            llvm::append_range(Inputs, J.ImportFiles);
+            llvm::append_range(Inputs, J.ImportsFiles);
             JOS.attribute("inputs", Array(Inputs));
 
             JOS.attribute("outputs", Array(Outputs));

llvm/lib/LTO/ThinLTOCodeGenerator.cpp

@@ -828,7 +828,7 @@ void ThinLTOCodeGenerator::emitImports(Module &TheModule, StringRef OutputName,
 
   // 'EmitImportsFiles' emits the list of modules from which to import from, and
   // the set of keys in `ModuleToSummariesForIndex` should be a superset of keys
-  // in `DecSummaries`, so no need to use `DecSummaries` in `EmitImportFiles`.
+  // in `DecSummaries`, so no need to use `DecSummaries` in `EmitImportsFiles`.
   GVSummaryPtrSet DecSummaries;
   ModuleToSummariesForIndexTy ModuleToSummariesForIndex;
   llvm::gatherImportedSummariesForModule(

llvm/test/ThinLTO/X86/dtlto/imports.ll

@@ -40,16 +40,16 @@ ERR: failed: DTLTO backend compilation: cannot open native object file:
 ; Check that imports files are not created even if -save-temps is active.
 RUN: not %{command} -save-temps 2>&1 \
 RUN:   | FileCheck %s --check-prefixes=ERR
-RUN: ls | FileCheck %s --check-prefix=NOIMPORTFILES
-NOIMPORTFILES-NOT: imports
+RUN: ls | FileCheck %s --check-prefix=NOIMPORTSFILES
+NOIMPORTSFILES-NOT: imports
 
 
 ; Check that imports files are created with -thinlto-emit-imports.
 RUN: not %{command} -thinlto-emit-imports 2>&1 \
 RUN:   | FileCheck %s --check-prefixes=ERR
-RUN: ls | FileCheck %s --check-prefix=IMPORTFILES
-IMPORTFILES: 0.bc.imports
-IMPORTFILES: 1.bc.imports
+RUN: ls | FileCheck %s --check-prefix=IMPORTSFILES
+IMPORTSFILES: 0.bc.imports
+IMPORTSFILES: 1.bc.imports
 
 ;--- 0.ll
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"