Clang/Preprocessor: Not add headers of __has_include into DepColloctor

When we preprocess the bellow code with
    clang -E -MD -MF

  #if __has_include(<limits.h>)
    // DO NOTHING
  #endif
  #if 0 && __has_include(<limits.h>)
    #include <limits.h>
  #endif

It will list limits.h in the dependencies.

The same case with #__has_include_next

Author: wzssyqa

clang/include/clang/Lex/PPCallbacks.h

@@ -370,7 +370,8 @@ class PPCallbacks {
   /// read.
   virtual void HasInclude(SourceLocation Loc, StringRef FileName, bool IsAngled,
                           OptionalFileEntryRef File,
-                          SrcMgr::CharacteristicKind FileType);
+                          SrcMgr::CharacteristicKind FileType,
+                          bool AddToDepCollector = true);
 
   /// Hook called when a source range is skipped.
   /// \param Range The SourceRange that was skipped. The range begins at the
@@ -621,7 +622,8 @@ class PPChainedCallbacks : public PPCallbacks {
 
   void HasInclude(SourceLocation Loc, StringRef FileName, bool IsAngled,
                   OptionalFileEntryRef File,
-                  SrcMgr::CharacteristicKind FileType) override;
+                  SrcMgr::CharacteristicKind FileType,
+                  bool AddToDepCollector = true) override;
 
   void PragmaOpenCLExtension(SourceLocation NameLoc, const IdentifierInfo *Name,
                              SourceLocation StateLoc, unsigned State) override {

clang/lib/Frontend/DependencyFile.cpp

@@ -104,15 +104,17 @@ struct DepCollectorPPCallbacks : public PPCallbacks {
 
   void HasInclude(SourceLocation Loc, StringRef SpelledFilename, bool IsAngled,
                   OptionalFileEntryRef File,
-                  SrcMgr::CharacteristicKind FileType) override {
+                  SrcMgr::CharacteristicKind FileType,
+                  bool AddToDepCollector = true) override {
     if (!File)
       return;
     StringRef Filename =
         llvm::sys::path::remove_leading_dotslash(File->getName());
-    DepCollector.maybeAddDependency(Filename, /*FromModule=*/false,
-                                    /*IsSystem=*/isSystem(FileType),
-                                    /*IsModuleFile=*/false,
-                                    /*IsMissing=*/false);
+    if (AddToDepCollector)
+      DepCollector.maybeAddDependency(Filename, /*FromModule=*/false,
+                                      /*IsSystem=*/isSystem(FileType),
+                                      /*IsModuleFile=*/false,
+                                      /*IsMissing=*/false);
   }
 
   void EndOfMainFile() override {

clang/lib/Lex/PPCallbacks.cpp

@@ -15,14 +15,17 @@ PPCallbacks::~PPCallbacks() = default;
 
 void PPCallbacks::HasInclude(SourceLocation Loc, StringRef FileName,
                              bool IsAngled, OptionalFileEntryRef File,
-                             SrcMgr::CharacteristicKind FileType) {}
+                             SrcMgr::CharacteristicKind FileType,
+                             bool AddToDepCollector) {}
 
 // Out of line key method.
 PPChainedCallbacks::~PPChainedCallbacks() = default;
 
 void PPChainedCallbacks::HasInclude(SourceLocation Loc, StringRef FileName,
                                     bool IsAngled, OptionalFileEntryRef File,
-                                    SrcMgr::CharacteristicKind FileType) {
-  First->HasInclude(Loc, FileName, IsAngled, File, FileType);
-  Second->HasInclude(Loc, FileName, IsAngled, File, FileType);
+                                    SrcMgr::CharacteristicKind FileType,
+                                    bool AddToDepCollector) {
+  First->HasInclude(Loc, FileName, IsAngled, File, FileType, AddToDepCollector);
+  Second->HasInclude(Loc, FileName, IsAngled, File, FileType,
+                     AddToDepCollector);
 }

clang/lib/Lex/PPMacroExpansion.cpp

@@ -1256,7 +1256,8 @@ static bool EvaluateHasIncludeCommon(Token &Tok, IdentifierInfo *II,
     SrcMgr::CharacteristicKind FileType = SrcMgr::C_User;
     if (File)
       FileType = PP.getHeaderSearchInfo().getFileDirFlavor(*File);
-    Callbacks->HasInclude(FilenameLoc, Filename, isAngled, File, FileType);
+    Callbacks->HasInclude(FilenameLoc, Filename, isAngled, File, FileType,
+                          false);
   }
 
   // Get the result value.  A result of true means the file exists.

clang/test/ClangScanDeps/has_include_if_elif.cpp

@@ -33,7 +33,7 @@
 // RUN: clang-scan-deps -compilation-database %t/cdb.json -mode preprocess | FileCheck %s
 
 // CHECK: tu.c
-// CHECK-NEXT: header1.h
-// CHECK-NEXT: header2.h
-// CHECK-NEXT: header3.h
-// CHECK-NEXT: header4.h
+// CHECK-NOT: header1.h
+// CHECK-NOT: header2.h
+// CHECK-NOT: header3.h
+// CHECK-NOT: header4.h

clang/test/Frontend/dependency-gen-has-include.c

@@ -17,11 +17,11 @@
 // RUN: FileCheck -input-file=%t.dir/file.deps %s
 // CHECK: dependency-gen-has-include.o
 // CHECK: dependency-gen-has-include.c
-// CHECK: a{{[/\\]}}header.h
+// CHECK-NOT: a{{[/\\]}}header.h
 // CHECK-NOT: missing{{[/\\]}}file.h
-// CHECK: system{{[/\\]}}system-header.h
+// CHECK-NOT: system{{[/\\]}}system-header.h
 // CHECK: next-a{{[/\\]}}next-header.h
-// CHECK: next-b{{[/\\]}}next-header.h
+// CHECK-NOT: next-b{{[/\\]}}next-header.h
 
 // Verify that we ignore system headers in user-only headers mode.
 // RUN: %clang -MMD -MF %t.dir/user-headers.deps %s -fsyntax-only -I %t.dir -isystem %t.dir/system -I %t.dir/next-a -I %t.dir/next-b

clang/test/Preprocessor/dependencies-on-has-include.c

@@ -0,0 +1,23 @@
+// Test -MF and -E flags with has_include
+
+#ifdef TEST_HAS_INCLUDE_NEXT
+#if __has_include_next(<limits.h>)
+// DO NOTHING
+#endif
+#endif
+
+#ifdef TEST_HAS_INCLUDE
+#if __has_include(<limits.h>)
+// DO NOTHING
+#endif
+#endif
+
+// RUN: %clang -DTEST_HAS_INCLUDE -E -MD -MF - %s \
+// RUN:    | FileCheck -check-prefix=TEST-HAS %s
+// TEST-HAS: dependencies-on-has-include.o:
+// TEST-HAS-NOT: limits.h
+
+// RUN: %clang -Wno-include-next-outside-header -DTEST_HAS_INCLUDE_NEXT -E -MD -MF - %s \
+// RUN:    | FileCheck -check-prefix=TEST-HAS-N %s
+// TEST-HAS-N: dependencies-on-has-include.o:
+// TEST-HAS-N-NOT: limits.h

clang/unittests/Tooling/DependencyScanning/DependencyScannerTest.cpp

@@ -198,13 +198,9 @@ TEST(DependencyScanner, ScanDepsReuseFilemanagerHasInclude) {
   TestDependencyScanningAction Action(Deps);
   Tool.run(&Action);
   using llvm::sys::path::convert_to_slash;
-  ASSERT_EQ(Deps.size(), 6u);
+  ASSERT_EQ(Deps.size(), 2u);
   EXPECT_EQ(convert_to_slash(Deps[0]), "/root/test.cpp");
-  EXPECT_EQ(convert_to_slash(Deps[1]), "/root/header.h");
-  EXPECT_EQ(convert_to_slash(Deps[2]), "/root/symlink.h");
-  EXPECT_EQ(convert_to_slash(Deps[3]), "/root/test.cpp");
-  EXPECT_EQ(convert_to_slash(Deps[4]), "/root/header.h");
-  EXPECT_EQ(convert_to_slash(Deps[5]), "/root/symlink.h");
+  EXPECT_EQ(convert_to_slash(Deps[1]), "/root/test.cpp");
 }
 
 TEST(DependencyScanner, ScanDepsWithFS) {