Do visit SDKSettings.json, but don't report it in tests

Author: jansvoboda11

clang/lib/Index/IndexingAction.cpp

@@ -919,6 +919,8 @@ class ModuleFileIndexDependencyCollector : public IndexDependencyProvider {
           // undesirable dependency on an intermediate build byproduct.
           if (FE->getName().ends_with("module.modulemap"))
             return;
+          if (FE->getName().ends_with("SDKSettings.json"))
+            return;
 
           visitor(*FE, isSystem);
         });

clang/lib/Serialization/ASTReader.cpp

@@ -3134,8 +3134,6 @@ ASTReader::ReadControlBlock(ModuleFile &F,
         for (unsigned I = 0; I < N; ++I) {
           bool IsSystem = I >= NumUserInputs;
           InputFileInfo FI = getInputFileInfo(F, I + 1);
-          if (FI.UnresolvedImportedFilename.ends_with("SDKSettings.json"))
-            continue;
           auto FilenameAsRequested = ResolveImportedPath(
               PathBuf, FI.UnresolvedImportedFilenameAsRequested, F);
           Listener->visitInputFile(
@@ -10348,8 +10346,6 @@ void ASTReader::visitInputFileInfos(
   for (unsigned I = 0; I < N; ++I) {
     bool IsSystem = I >= NumUserInputs;
     InputFileInfo IFI = getInputFileInfo(MF, I+1);
-    if (IFI.UnresolvedImportedFilename.ends_with("SDKSettings.json"))
-      continue;
     Visitor(IFI, IsSystem);
   }
 }
@@ -10365,8 +10361,6 @@ void ASTReader::visitInputFiles(serialization::ModuleFile &MF,
   for (unsigned I = 0; I < N; ++I) {
     bool IsSystem = I >= NumUserInputs;
     InputFile IF = getInputFile(MF, I+1, Complain);
-    if (IF.getFile() && IF.getFile()->getName().ends_with("SDKSettings.json"))
-      continue;
     Visitor(IF, IsSystem);
   }
 }

clang/tools/c-index-test/core_main.cpp

@@ -861,7 +861,8 @@ static int scanDeps(ArrayRef<const char *> Args, std::string WorkingDirectory,
         llvm::outs() << "      " << ModuleName << "\n";
       llvm::outs() << "    file-deps:\n";
       for (const auto &FileName : ArrayRef(FileDeps.Strings, FileDeps.Count))
-        llvm::outs() << "      " << FileName << "\n";
+        if (!StringRef(FileName).ends_with("SDKSettings.json"))
+          llvm::outs() << "      " << FileName << "\n";
       llvm::outs() << "    build-args:";
       for (const auto &Arg :
            ArrayRef(BuildArguments.Strings, BuildArguments.Count))

clang/tools/clang-scan-deps/ClangScanDeps.cpp

@@ -601,7 +601,8 @@ template <typename Container>
 static auto toJSONStrings(llvm::json::OStream &JOS, Container &&Strings) {
   return [&JOS, Strings = std::forward<Container>(Strings)] {
     for (StringRef Str : Strings)
-      JOS.value(Str);
+      if (!Str.ends_with("SDKSettings.json"))
+        JOS.value(Str);
   };
 }
 
@@ -764,7 +765,10 @@ class FullDeps {
                                toJSONStrings(JOS, MD.getBuildArguments()));
             JOS.attribute("context-hash", StringRef(MD.ID.ContextHash));
             JOS.attributeArray("file-deps", [&] {
-              MD.forEachFileDep([&](StringRef FileDep) { JOS.value(FileDep); });
+              MD.forEachFileDep([&](StringRef FileDep) {
+                if (!FileDep.ends_with("SDKSettings.json"))
+                  JOS.value(FileDep);
+              });
             });
             JOS.attributeArray("link-libraries",
                                toJSONSorted(JOS, MD.LinkLibraries));