[Tooling/Inclusion] Move the generated mapping .inc file to private places.

[hokein]

Summary

The .inc files are private now, clients should tooling::stdlib APIs instead.

[augusto2112]

Hi @hokein, this broke the LLDB incremental build (https://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/50629/console). How do we fix it?

[hokein]

In D143399#4110806, @augusto2112 wrote:

Hi @hokein, this broke the LLDB incremental build (https://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/50629/console). How do we fix it?

sorry for the breakage. Could you try to remove the two textual header "Tooling/Inclusions/{C,Std}SymbolMap.inc"lines in the clang/include/clang/module.modulemap to see whether it fixes the issue?

[hokein]

In D143399#4111235, @hokein wrote:

In D143399#4110806, @augusto2112 wrote:

Hi @hokein, this broke the LLDB incremental build (https://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/50629/console). How do we fix it?

sorry for the breakage. Could you try to remove the two textual header "Tooling/Inclusions/{C,Std}SymbolMap.inc"lines in the clang/include/clang/module.modulemap to see whether it fixes the issue?

OK, it was fixed in https://github.com/llvm/llvm-project/commit/4cbf4bb4dd17b813179467396c692180681cb003.

clang/lib/Tooling/Inclusions/Stdlib/StandardLibrary.cpp

static const SymbolHeaderMapping *getMappingPerLang(Lang L) {
   return LanguageMappings[static_cast<unsigned>(L)];
 }
 
 static int countSymbols(Lang Language) {
   unsigned SymCount = 0;
 #define SYMBOL(Name, NS, Header) ++SymCount;
   switch (Language) {
   case Lang::C:
-#include "clang/Tooling/Inclusions/CSymbolMap.inc"
+#include "CSymbolMap.inc"
     break;
   case Lang::CXX:
-#include "clang/Tooling/Inclusions/StdSymbolMap.inc"
+#include "StdSymbolMap.inc"
     break;
   }
 #undef SYMBOL
   return SymCount;
 }
 
 static int initialize(Lang Language) {
   SymbolHeaderMapping *Mapping = new SymbolHeaderMapping();
auto Add = [&, SymIndex(0)](llvm::StringRef QName, unsigned NSLen,
     NSSymbolMap &NSSymbols = AddNS(QName.take_front(NSLen));
     NSSymbols.try_emplace(QName.drop_front(NSLen), SymIndex);
 
     ++SymIndex;
   };
 #define SYMBOL(Name, NS, Header) Add(#NS #Name, strlen(#NS), #Header);
   switch (Language) {
   case Lang::C:
-#include "clang/Tooling/Inclusions/CSymbolMap.inc"
+#include "CSymbolMap.inc"
     break;
   case Lang::CXX:
-#include "clang/Tooling/Inclusions/StdSymbolMap.inc"
+#include "StdSymbolMap.inc"
     break;
   }
 #undef SYMBOL
 
   Mapping->HeaderNames = new llvm::StringRef[Mapping->HeaderIDs->size()];
   for (const auto &E : *Mapping->HeaderIDs)
     Mapping->HeaderNames[E.second] = E.first;
 

utils/bazel/llvm-project-overlay/clang/BUILD.bazel

deps = [
         "//llvm:Support",
     ],
 )
 
 cc_library(
     name = "tooling_inclusions",
     srcs = glob([
         "lib/Tooling/Inclusions/**/*.cpp",
+        "lib/Tooling/Inclusions/**/*.inc",
     ]),
     hdrs = glob([
         "include/clang/Tooling/Inclusions/**/*.h",
-        "include/clang/Tooling/Inclusions/**/*.inc",
     ]),
     deps = [
         ":ast",
         ":basic",
         ":lex",
         ":rewrite",
         ":tooling_core",
         "//llvm:Support",