Adopt upstream llvm-project monorepo directory layout (#13049)

This will be required for future LLVM upgrades that rely on a common cmake/ directory next to clang/ and llvm/. The bulk of this change is the result of the following commands: $ mkdir interpreter/llvm-project/ $ git mv interpreter/llvm/src/tools/clang/ interpreter/llvm-project/clang/ $ git mv interpreter/llvm/src/ interpreter/llvm-project/llvm/ $ git mv interpreter/llvm/llvm-project.tag interpreter/llvm-project/llvm-project.tag
root-project · Jun 25, 2023 · 95cdce8 · 95cdce8
1 parent acb2334
commit 95cdce8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Interpreter/CMakeLists.txt b/lib/Interpreter/CMakeLists.txt
@@ -351,7 +351,7 @@ add_file_dependencies(${CMAKE_CURRENT_SOURCE_DIR}/CIFactory.cpp
 # If LLVM is external, but Clang is builtin, we must use some files
 # from patched (builtin) version of LLVM
 if ((NOT builtin_llvm) AND builtin_clang)
-  set(FixInclude "${CMAKE_SOURCE_DIR}/interpreter/llvm/src/include")
+  set(FixInclude "${CMAKE_SOURCE_DIR}/interpreter/llvm-project/llvm/include")
 
   get_property(P SOURCE IncrementalJIT.cpp PROPERTY INCLUDE_DIRECTORIES)
   list(INSERT P 0 ${FixInclude})

diff --git a/test/Utils/Transform.C b/test/Utils/Transform.C
@@ -429,7 +429,7 @@ std::cout << Transform::GetPartiallyDesugaredType(Ctx, QT, transConfig).getAsStr
 if (const clang::RecordDecl *rdecl = llvm::dyn_cast_or_null<clang::RecordDecl>(decl)) {
   clang::RecordDecl::field_iterator field_iter = rdecl->field_begin();
   // For some reason we can not call field_end:
-  // cling: root/interpreter/llvm/src/tools/clang/lib/CodeGen/CGCall.cpp:1839: void checkArgMatches(llvm::Value*, unsigned int&, llvm::FunctionType*): Assertion `Elt->getType() == FTy->getParamType(ArgNo)' failed.
+  // cling: root/interpreter/llvm-project/clang/lib/CodeGen/CGCall.cpp:1839: void checkArgMatches(llvm::Value*, unsigned int&, llvm::FunctionType*): Assertion `Elt->getType() == FTy->getParamType(ArgNo)' failed.
   // so just 'guess' the size
   int i = 0;
   while( i < 2 )  {
@@ -475,7 +475,7 @@ if (const clang::RecordDecl *rdecl = llvm::dyn_cast_or_null<clang::RecordDecl>(d
   std::cout << Transform::GetPartiallyDesugaredType(Ctx, QT, transConfig).getAsString().c_str() << std::endl;
   clang::RecordDecl::field_iterator field_iter = rdecl->field_begin();
   // For some reason we can not call field_end:
-  // cling: root/interpreter/llvm/src/tools/clang/lib/CodeGen/CGCall.cpp:1839: void checkArgMatches(llvm::Value*, unsigned int&, llvm::FunctionType*): Assertion `Elt->getType() == FTy->getParamType(ArgNo)' failed.
+  // cling: root/interpreter/llvm-project/clang/lib/CodeGen/CGCall.cpp:1839: void checkArgMatches(llvm::Value*, unsigned int&, llvm::FunctionType*): Assertion `Elt->getType() == FTy->getParamType(ArgNo)' failed.
   // so just 'guess' the size
   int i = 0;
   while( i < 2 )  {