Capture the proper module name even if the module indexing is disabled

Author: DavidGoldman

lib/Index/IndexRecord.cpp

@@ -423,15 +423,15 @@ static void addModuleDependencies(ArrayRef<ImportedModule> imports,
           bool withoutUnitName = true;
           if (FU->getKind() == FileUnitKind::ClangModule) {
             auto clangModUnit = cast<ClangModuleUnit>(LFU);
-            if ((!clangModUnit->isSystemModule() || indexSystemModules)
-                && indexClangModules) {
-              withoutUnitName = false;
+            if ((!clangModUnit->isSystemModule() || indexSystemModules)) {
+              withoutUnitName = !indexClangModules;
               if (auto clangMod = clangModUnit->getUnderlyingClangModule()) {
                 moduleName = clangMod->getTopLevelModuleName();
                 // FIXME: clang's -Rremarks do not seem to go through Swift's
                 // diagnostic emitter.
-                clang::index::emitIndexDataForModuleFile(clangMod,
-                                                         clangCI, unitWriter);
+                if (indexClangModules)
+                  clang::index::emitIndexDataForModuleFile(clangMod,
+                                                           clangCI, unitWriter);
               }
             }
           } else {

test/Index/Store/unit-pcm-dependency.swift

@@ -68,7 +68,7 @@ func test() {
 // FILE1-PCM: Unit | user | ClangModuleB | {{.*}}ClangModuleB-{{[A-Z0-9]*}}.pcm | ClangModuleB-{{[A-Z0-9]*}}.pcm-
 // FILE1-PCM: Unit | user | ClangModuleC | {{.*}}ClangModuleC-{{[A-Z0-9]*}}.pcm | ClangModuleC-{{[A-Z0-9]*}}.pcm-
 // FILE1-IGNORE: Unit | user | ClangModuleB | {{.*}}ClangModuleB-{{[A-Z0-9]*}}.pcm
-// FILE1-IGNORE: Unit | user | Sub1 | {{.*}}ClangModuleC-{{[A-Z0-9]*}}.pcm
+// FILE1-IGNORE: Unit | user | ClangModuleC | {{.*}}ClangModuleC-{{[A-Z0-9]*}}.pcm
 // FILE1-NOT: Unit |{{.*}}ClangModuleA
 // FILE1: Record | user | {{.*}}unit-pcm-dependency.swift | unit-pcm-dependency.swift-
 // FILE1-NOT: Unit |{{.*}}ClangModuleA