gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jonas Hahnfeld 2023-06-25 13:40:27 +02:00 committed by jenkins
parent acb2334131
commit 95cdce8055
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Interpreter/CMakeLists.txt
View File

@ -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})

4
test/Utils/Transform.C
View File

@ -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 ) {