From af6b0fce736cc241172acb88a2767862c1fed3d3 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Tue, 15 Jul 2025 17:05:24 +0100 Subject: [PATCH 01/27] Make CppInterOp llvm 21 compatible --- .github/workflows/emscripten.yml | 59 ++++++++++++++++++- .github/workflows/main.yml | 46 +++++++++++++++ CMakeLists.txt | 12 ++-- lib/CppInterOp/Compatibility.h | 11 ++++ lib/CppInterOp/CppInterOp.cpp | 6 +- ...ws-emscripten-clang21-1-CrossCompile.patch | 20 +++++++ ...1-2-shift-temporary-files-to-tmp-dir.patch | 15 +++++ 7 files changed, 159 insertions(+), 10 deletions(-) create mode 100644 patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch create mode 100644 patches/llvm/emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index 98cc10ef3..3b0e60a42 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -77,6 +77,34 @@ jobs: llvm_enable_projects: "clang;lld" llvm_targets_to_build: "WebAssembly" emsdk_ver: "3.1.73" + - name: ubu24-arm-clang-repl-21-emscripten + os: ubuntu-24.04-arm + clang-runtime: '21' + cling: Off + llvm_enable_projects: "clang;lld" + llvm_targets_to_build: "WebAssembly" + emsdk_ver: "3.1.73" + - name: osx15-arm-clang-repl-21-emscripten + os: macos-15 + clang-runtime: '21' + cling: Off + llvm_enable_projects: "clang;lld" + llvm_targets_to_build: "WebAssembly" + emsdk_ver: "3.1.73" + - name: ubu24-x86-clang-repl-21-emscripten + os: ubuntu-24.04 + clang-runtime: '21' + cling: Off + llvm_enable_projects: "clang;lld" + llvm_targets_to_build: "WebAssembly" + emsdk_ver: "3.1.73" + - name: win2025-x86-clang-repl-21-emscripten + os: windows-2025 + clang-runtime: '21' + cling: Off + llvm_enable_projects: "clang;lld" + llvm_targets_to_build: "WebAssembly" + emsdk_ver: "3.1.73" steps: - uses: actions/checkout@v4 @@ -199,7 +227,7 @@ jobs: else # Apply patches llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]') - if [[ "${llvm_vers}" == "19" || "${llvm_vers}" == "20" ]]; then + if [[ "${llvm_vers}" == "19" || "${llvm_vers}" == "20" || "${llvm_vers}" == "21" ]]; then git apply -v ../patches/llvm/emscripten-clang${{ matrix.clang-runtime }}-*.patch echo "Apply emscripten-clang${{ matrix.clang-runtime }}-*.patch patches:" fi @@ -321,6 +349,11 @@ jobs: git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch git apply -v emscripten-clang20-3-enable_exception_handling.patch } + elseif ( "${{ matrix.clang-runtime }}" -imatch "21" ) + { + git apply -v Windows-emscripten-clang21-1-CrossCompile.patch + git apply -v emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch + } cd build echo "Apply clang${{ matrix.clang-runtime }}-*.patch patches:" emcmake cmake -DCMAKE_BUILD_TYPE=Release ` @@ -431,6 +464,30 @@ jobs: cling: Off micromamba_shell_init: powershell emsdk_ver: "3.1.73" + - name: ubu24-x86-clang-repl-21-emscripten_wasm + os: ubuntu-24.04 + clang-runtime: '21' + cling: Off + micromamba_shell_init: bash + emsdk_ver: "3.1.73" + - name: osx15-arm-clang-repl-21-emscripten_wasm + os: macos-15 + clang-runtime: '21' + cling: Off + micromamba_shell_init: bash + emsdk_ver: "3.1.73" + - name: ubu24-arm-clang-repl-21-emscripten_wasm + os: ubuntu-24.04-arm + clang-runtime: '21' + cling: Off + micromamba_shell_init: bash + emsdk_ver: "3.1.73" + - name: win2025-x86-clang-repl-21-emscripten + os: windows-2025 + clang-runtime: '21' + cling: Off + micromamba_shell_init: powershell + emsdk_ver: "3.1.73" steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bc40f0bea..605780436 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,6 +23,14 @@ jobs: matrix: include: # Ubuntu Arm Jobs + - name: ubu24-arm-gcc12-clang-repl-21 + os: ubuntu-24.04-arm + compiler: gcc-12 + clang-runtime: '21' + cling: Off + cppyy: Off + llvm_enable_projects: "clang" + llvm_targets_to_build: "host;NVPTX" - name: ubu22-arm-gcc12-clang-repl-20-coverage os: ubuntu-22.04-arm compiler: gcc-12 @@ -66,6 +74,14 @@ jobs: llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" # Ubuntu X86 Jobs + - name: ubu24-x86-gcc12-clang-repl-21 + os: ubuntu-24.04 + compiler: gcc-12 + clang-runtime: '21' + cling: Off + cppyy: Off + llvm_enable_projects: "clang" + llvm_targets_to_build: "host;NVPTX" - name: ubu24-x86-gcc12-clang-repl-20 os: ubuntu-24.04 compiler: gcc-12 @@ -100,6 +116,14 @@ jobs: llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" # MacOS Arm Jobs + - name: osx15-arm-clang-clang-repl-21 + os: macos-15 + compiler: clang + clang-runtime: '21' + cling: Off + cppyy: Off + llvm_enable_projects: "clang" + llvm_targets_to_build: "host" - name: osx15-arm-clang-clang-repl-20 os: macos-15 compiler: clang @@ -134,6 +158,14 @@ jobs: llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" # MacOS X86 Jobs + - name: osx13-x86-clang-clang-repl-21 + os: macos-13 + compiler: clang + clang-runtime: '21' + cling: Off + cppyy: Off + llvm_enable_projects: "clang" + llvm_targets_to_build: "host" - name: osx13-x86-clang-clang-repl-20 os: macos-13 compiler: clang @@ -168,6 +200,13 @@ jobs: llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" # Windows Arm Jobs + - name: win11-msvc-clang-repl-21 + os: windows-11-arm + compiler: msvc + clang-runtime: '21' + cling: Off + llvm_enable_projects: "clang" + llvm_targets_to_build: "host;NVPTX" - name: win11-msvc-clang-repl-20 os: windows-11-arm compiler: msvc @@ -184,6 +223,13 @@ jobs: llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" # Windows X86 Jobs + - name: win2025-msvc-clang-repl-21 + os: windows-2025 + compiler: msvc + clang-runtime: '21' + cling: Off + llvm_enable_projects: "clang" + llvm_targets_to_build: "host;NVPTX" - name: win2025-msvc-clang-repl-20 os: windows-2025 compiler: msvc diff --git a/CMakeLists.txt b/CMakeLists.txt index 981c57ced..cc8d38617 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,14 +68,14 @@ include(GNUInstallDirs) ## Define supported version of clang and llvm set(CLANG_MIN_SUPPORTED 18.0) - set(CLANG_MAX_SUPPORTED "20.1.x") - set(CLANG_VERSION_UPPER_BOUND 21.0.0) + set(CLANG_MAX_SUPPORTED "21.1.x") + set(CLANG_VERSION_UPPER_BOUND 22.0.0) set(LLD_MIN_SUPPORTED 18.0) - set(LLD_MAX_SUPPORTED "20.1.x") - set(LLD_VERSION_UPPER_BOUND 21.0.0) + set(LLD_MAX_SUPPORTED "21.1.x") + set(LLD_VERSION_UPPER_BOUND 22.0.0) set(LLVM_MIN_SUPPORTED 18.0) - set(LLVM_MAX_SUPPORTED "20.1.x") - set(LLVM_VERSION_UPPER_BOUND 21.0.0) + set(LLVM_MAX_SUPPORTED "21.1.x") + set(LLVM_VERSION_UPPER_BOUND 22.0.0) ## Set Cmake packages search order diff --git a/lib/CppInterOp/Compatibility.h b/lib/CppInterOp/Compatibility.h index ddee92574..f82d67453 100644 --- a/lib/CppInterOp/Compatibility.h +++ b/lib/CppInterOp/Compatibility.h @@ -31,6 +31,17 @@ static inline char* GetEnv(const char* Var_Name) { #endif } +#if CLANG_VERSION_MAJOR < 21 +#define clang_LookupResult_Found clang::LookupResult::Found +#define clang_LookupResult_Not_Found clang::LookupResult::NotFound +#define clang_LookupResult_Found_Overloaded clang::LookupResult::FoundOverloaded +#else +#define clang_LookupResult_Found clang::LookupResultKind::Found +#define clang_LookupResult_Not_Found clang::LookupResultKind::NotFound +#define clang_LookupResult_Found_Overloaded \ + clang::LookupResultKind::FoundOverloaded +#endif + #if CLANG_VERSION_MAJOR < 19 #define Template_Deduction_Result Sema::TemplateDeductionResult #define Template_Deduction_Result_Success \ diff --git a/lib/CppInterOp/CppInterOp.cpp b/lib/CppInterOp/CppInterOp.cpp index 01a14ce03..b6e16323b 100755 --- a/lib/CppInterOp/CppInterOp.cpp +++ b/lib/CppInterOp/CppInterOp.cpp @@ -1135,16 +1135,16 @@ bool GetClassTemplatedMethods(const std::string& name, TCppScope_t parent, auto* DC = clang::Decl::castToDeclContext(D); Cpp_utils::Lookup::Named(&S, R, DC); - if (R.getResultKind() == clang::LookupResult::NotFound && funcs.empty()) + if (R.getResultKind() == clang_LookupResult_Not_Found && funcs.empty()) return false; // Distinct match, single Decl - else if (R.getResultKind() == clang::LookupResult::Found) { + else if (R.getResultKind() == clang_LookupResult_Found) { if (IsTemplatedFunction(R.getFoundDecl())) funcs.push_back(R.getFoundDecl()); } // Loop over overload set - else if (R.getResultKind() == clang::LookupResult::FoundOverloaded) { + else if (R.getResultKind() == clang_LookupResult_Found_Overloaded) { for (auto* Found : R) if (IsTemplatedFunction(Found)) funcs.push_back(Found); diff --git a/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch b/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch new file mode 100644 index 000000000..a1ffeccc8 --- /dev/null +++ b/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch @@ -0,0 +1,20 @@ +diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake +index 39b4abaa0..474ceddbb 100644 +--- a/llvm/cmake/modules/CrossCompile.cmake ++++ b/llvm/cmake/modules/CrossCompile.cmake +@@ -74,10 +74,12 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype) + endif() + + add_custom_command(OUTPUT ${${project_name}_${target_name}_BUILD}/CMakeCache.txt +- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" ++ COMMAND ${CMAKE_COMMAND} -G Ninja + -DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}" +- -DCMAKE_C_COMPILER_LAUNCHER="${CMAKE_C_COMPILER_LAUNCHER}" +- -DCMAKE_CXX_COMPILER_LAUNCHER="${CMAKE_CXX_COMPILER_LAUNCHER}" ++ -DCMAKE_C_COMPILER="clang-cl" ++ -DCMAKE_CXX_COMPILER="clang-cl" ++ -DCMAKE_ASM_MASM_COMPILER=llvm-ml ++ -DCMAKE_ASM_MASM_FLAGS="-m64" + ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_CURRENT_SOURCE_DIR} + ${CROSS_TOOLCHAIN_FLAGS_${project_name}_${target_name}} + -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE diff --git a/patches/llvm/emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch b/patches/llvm/emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch new file mode 100644 index 000000000..32ac45c13 --- /dev/null +++ b/patches/llvm/emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch @@ -0,0 +1,15 @@ +diff --git a/clang/lib/Interpreter/Wasm.cpp b/clang/lib/Interpreter/Wasm.cpp +index aa10b160ccf8..184867e2b55f 100644 +--- a/clang/lib/Interpreter/Wasm.cpp ++++ b/clang/lib/Interpreter/Wasm.cpp +@@ -76,8 +76,8 @@ llvm::Error WasmIncrementalExecutor::addModule(PartialTranslationUnit &PTU) { + llvm::TargetMachine *TargetMachine = Target->createTargetMachine( + PTU.TheModule->getTargetTriple(), "", "", TO, llvm::Reloc::Model::PIC_); + PTU.TheModule->setDataLayout(TargetMachine->createDataLayout()); +- std::string ObjectFileName = PTU.TheModule->getName().str() + ".o"; +- std::string BinaryFileName = PTU.TheModule->getName().str() + ".wasm"; ++ std::string ObjectFileName = "/tmp/" + PTU.TheModule->getName().str() + ".o"; ++ std::string BinaryFileName = "/tmp/" + PTU.TheModule->getName().str() + ".wasm"; + + std::error_code Error; + llvm::raw_fd_ostream ObjectFileOutput(llvm::StringRef(ObjectFileName), Error); From 3d74a26394a8e27f7a9129a64d3bac284c076cac Mon Sep 17 00:00:00 2001 From: mcbarton Date: Tue, 15 Jul 2025 21:03:13 +0100 Subject: [PATCH 02/27] Update Windows-emscripten-clang21-1-CrossCompile.patch --- .../llvm/Windows-emscripten-clang21-1-CrossCompile.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch b/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch index a1ffeccc8..00e0aef6f 100644 --- a/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch +++ b/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch @@ -8,9 +8,9 @@ index 39b4abaa0..474ceddbb 100644 add_custom_command(OUTPUT ${${project_name}_${target_name}_BUILD}/CMakeCache.txt - COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" + COMMAND ${CMAKE_COMMAND} -G Ninja - -DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}" -- -DCMAKE_C_COMPILER_LAUNCHER="${CMAKE_C_COMPILER_LAUNCHER}" -- -DCMAKE_CXX_COMPILER_LAUNCHER="${CMAKE_CXX_COMPILER_LAUNCHER}" + "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}" +- "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}" +- "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}" + -DCMAKE_C_COMPILER="clang-cl" + -DCMAKE_CXX_COMPILER="clang-cl" + -DCMAKE_ASM_MASM_COMPILER=llvm-ml From aef6370df2014afc6d60a07699f94883f664ac00 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 16 Jul 2025 09:20:19 +0100 Subject: [PATCH 03/27] Update exports.ld --- lib/CppInterOp/exports.ld | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/CppInterOp/exports.ld b/lib/CppInterOp/exports.ld index 49b7b0d83..c1c4e59e8 100644 --- a/lib/CppInterOp/exports.ld +++ b/lib/CppInterOp/exports.ld @@ -50,4 +50,5 @@ -Wl,--export=_ZNK5clang4Type14isFloatingTypeEv -Wl,--export=_ZNK5clang12FunctionDecl12getNumParamsEv -Wl,--export=__clang_Interpreter_SetValueNoAlloc --Wl,--export=__clang_Interpreter_SetValueWithAlloc \ No newline at end of file +-Wl,--export=__clang_Interpreter_SetValueWithAlloc +-Wl,--export=_ZN5clang11Interpreter6createENSt3__210unique_ptrINS_16CompilerInstanceENS1_14default_deleteIS3_EEEENS2_IN4llvm3orc12LLJITBuilderENS4_IS9_EEEE From 2a280d1536a4c0c89fc159c8e0f68624aee61a10 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 16 Jul 2025 10:59:46 +0100 Subject: [PATCH 04/27] Update exports.ld --- lib/CppInterOp/exports.ld | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/CppInterOp/exports.ld b/lib/CppInterOp/exports.ld index c1c4e59e8..65c3b439b 100644 --- a/lib/CppInterOp/exports.ld +++ b/lib/CppInterOp/exports.ld @@ -51,4 +51,5 @@ -Wl,--export=_ZNK5clang12FunctionDecl12getNumParamsEv -Wl,--export=__clang_Interpreter_SetValueNoAlloc -Wl,--export=__clang_Interpreter_SetValueWithAlloc --Wl,--export=_ZN5clang11Interpreter6createENSt3__210unique_ptrINS_16CompilerInstanceENS1_14default_deleteIS3_EEEENS2_IN4llvm3orc12LLJITBuilderENS4_IS9_EEEE +-Wl,--export=_ZN5clang11Interpreter6createENSt3__210unique_ptrINS_16CompilerInstanceENS1_14default_deleteIS3_EEEENS2_IN4llvm3orc12LLJITBuilderENS4_IS9_EEEE +-Wl,--export=_ZNK5clang13CXXRecordDecl19isInjectedClassNameEv From bbd2a48422d759ba2bb72b6d315506790c947dae Mon Sep 17 00:00:00 2001 From: mcbarton Date: Tue, 9 Sep 2025 16:02:20 +0100 Subject: [PATCH 05/27] Define Print_Canonical_Types for llvm 21 compatibility --- lib/CppInterOp/Compatibility.h | 6 ++++++ lib/CppInterOp/CppInterOp.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/CppInterOp/Compatibility.h b/lib/CppInterOp/Compatibility.h index fe8eed44c..b1dc2daa9 100644 --- a/lib/CppInterOp/Compatibility.h +++ b/lib/CppInterOp/Compatibility.h @@ -31,6 +31,12 @@ static inline char* GetEnv(const char* Var_Name) { #endif } +#if CLANG_VERSION_MAJOR < 21 +#define Print_Canonical_Types PrintCanonicalTypes +#else +#define Print_Canonical_Types PrintAsCanonical +#endif + #if CLANG_VERSION_MAJOR < 21 #define clang_LookupResult_Found clang::LookupResult::Found #define clang_LookupResult_Not_Found clang::LookupResult::NotFound diff --git a/lib/CppInterOp/CppInterOp.cpp b/lib/CppInterOp/CppInterOp.cpp index 819ec72c1..6613e2546 100755 --- a/lib/CppInterOp/CppInterOp.cpp +++ b/lib/CppInterOp/CppInterOp.cpp @@ -1954,7 +1954,7 @@ static void GetDeclName(const clang::Decl* D, ASTContext& Context, PrintingPolicy Policy(Context.getPrintingPolicy()); Policy.SuppressTagKeyword = true; Policy.SuppressUnwrittenScope = true; - Policy.PrintCanonicalTypes = true; + Policy.Print_Canonical_Types = true; if (const TypeDecl* TD = dyn_cast(D)) { // This is a class, struct, or union member. QualType QT; From 68a3695b9701bb4be192dc22143409d88bb59741 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Tue, 15 Jul 2025 17:05:24 +0100 Subject: [PATCH 06/27] Make CppInterOp llvm 21 compatible --- .github/workflows/emscripten.yml | 59 ++++++++++++++++++- .github/workflows/main.yml | 46 +++++++++++++++ CMakeLists.txt | 12 ++-- lib/CppInterOp/Compatibility.h | 11 ++++ lib/CppInterOp/CppInterOp.cpp | 6 +- ...ws-emscripten-clang21-1-CrossCompile.patch | 20 +++++++ ...1-2-shift-temporary-files-to-tmp-dir.patch | 15 +++++ 7 files changed, 159 insertions(+), 10 deletions(-) create mode 100644 patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch create mode 100644 patches/llvm/emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index daa4d8152..3c27a20b1 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -77,6 +77,34 @@ jobs: llvm_enable_projects: "clang;lld" llvm_targets_to_build: "WebAssembly" emsdk_ver: "3.1.73" + - name: ubu24-arm-clang-repl-21-emscripten + os: ubuntu-24.04-arm + clang-runtime: '21' + cling: Off + llvm_enable_projects: "clang;lld" + llvm_targets_to_build: "WebAssembly" + emsdk_ver: "3.1.73" + - name: osx15-arm-clang-repl-21-emscripten + os: macos-15 + clang-runtime: '21' + cling: Off + llvm_enable_projects: "clang;lld" + llvm_targets_to_build: "WebAssembly" + emsdk_ver: "3.1.73" + - name: ubu24-x86-clang-repl-21-emscripten + os: ubuntu-24.04 + clang-runtime: '21' + cling: Off + llvm_enable_projects: "clang;lld" + llvm_targets_to_build: "WebAssembly" + emsdk_ver: "3.1.73" + - name: win2025-x86-clang-repl-21-emscripten + os: windows-2025 + clang-runtime: '21' + cling: Off + llvm_enable_projects: "clang;lld" + llvm_targets_to_build: "WebAssembly" + emsdk_ver: "3.1.73" steps: - uses: actions/checkout@v5 @@ -201,7 +229,7 @@ jobs: else # Apply patches llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]') - if [[ "${llvm_vers}" == "19" || "${llvm_vers}" == "20" ]]; then + if [[ "${llvm_vers}" == "19" || "${llvm_vers}" == "20" || "${llvm_vers}" == "21" ]]; then git apply -v ../patches/llvm/emscripten-clang${{ matrix.clang-runtime }}-*.patch echo "Apply emscripten-clang${{ matrix.clang-runtime }}-*.patch patches:" fi @@ -327,6 +355,11 @@ jobs: git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch git apply -v emscripten-clang20-3-enable_exception_handling.patch } + elseif ( "${{ matrix.clang-runtime }}" -imatch "21" ) + { + git apply -v Windows-emscripten-clang21-1-CrossCompile.patch + git apply -v emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch + } cd build echo "Apply clang${{ matrix.clang-runtime }}-*.patch patches:" emcmake cmake -DCMAKE_BUILD_TYPE=Release ` @@ -439,6 +472,30 @@ jobs: cling: Off micromamba_shell_init: powershell emsdk_ver: "3.1.73" + - name: ubu24-x86-clang-repl-21-emscripten_wasm + os: ubuntu-24.04 + clang-runtime: '21' + cling: Off + micromamba_shell_init: bash + emsdk_ver: "3.1.73" + - name: osx15-arm-clang-repl-21-emscripten_wasm + os: macos-15 + clang-runtime: '21' + cling: Off + micromamba_shell_init: bash + emsdk_ver: "3.1.73" + - name: ubu24-arm-clang-repl-21-emscripten_wasm + os: ubuntu-24.04-arm + clang-runtime: '21' + cling: Off + micromamba_shell_init: bash + emsdk_ver: "3.1.73" + - name: win2025-x86-clang-repl-21-emscripten + os: windows-2025 + clang-runtime: '21' + cling: Off + micromamba_shell_init: powershell + emsdk_ver: "3.1.73" steps: - uses: actions/checkout@v5 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 20232cca1..ace7a1ead 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,6 +23,14 @@ jobs: matrix: include: # Ubuntu Arm Jobs + - name: ubu24-arm-gcc12-clang-repl-21 + os: ubuntu-24.04-arm + compiler: gcc-12 + clang-runtime: '21' + cling: Off + cppyy: Off + llvm_enable_projects: "clang" + llvm_targets_to_build: "host;NVPTX" - name: ubu22-arm-gcc12-clang-repl-20-coverage os: ubuntu-22.04-arm compiler: gcc-12 @@ -66,6 +74,14 @@ jobs: llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" # Ubuntu X86 Jobs + - name: ubu24-x86-gcc12-clang-repl-21 + os: ubuntu-24.04 + compiler: gcc-12 + clang-runtime: '21' + cling: Off + cppyy: Off + llvm_enable_projects: "clang" + llvm_targets_to_build: "host;NVPTX" - name: ubu24-x86-gcc12-clang-repl-20 os: ubuntu-24.04 compiler: gcc-12 @@ -100,6 +116,14 @@ jobs: llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" # MacOS Arm Jobs + - name: osx15-arm-clang-clang-repl-21 + os: macos-15 + compiler: clang + clang-runtime: '21' + cling: Off + cppyy: Off + llvm_enable_projects: "clang" + llvm_targets_to_build: "host" - name: osx15-arm-clang-clang-repl-20 os: macos-15 compiler: clang @@ -134,6 +158,14 @@ jobs: llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" # MacOS X86 Jobs + - name: osx13-x86-clang-clang-repl-21 + os: macos-13 + compiler: clang + clang-runtime: '21' + cling: Off + cppyy: Off + llvm_enable_projects: "clang" + llvm_targets_to_build: "host" - name: osx13-x86-clang-clang-repl-20 os: macos-13 compiler: clang @@ -168,6 +200,13 @@ jobs: llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" # Windows Arm Jobs + - name: win11-msvc-clang-repl-21 + os: windows-11-arm + compiler: msvc + clang-runtime: '21' + cling: Off + llvm_enable_projects: "clang" + llvm_targets_to_build: "host;NVPTX" - name: win11-msvc-clang-repl-20 os: windows-11-arm compiler: msvc @@ -184,6 +223,13 @@ jobs: llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" # Windows X86 Jobs + - name: win2025-msvc-clang-repl-21 + os: windows-2025 + compiler: msvc + clang-runtime: '21' + cling: Off + llvm_enable_projects: "clang" + llvm_targets_to_build: "host;NVPTX" - name: win2025-msvc-clang-repl-20 os: windows-2025 compiler: msvc diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d1aa034d..1850ddcc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,14 +68,14 @@ include(GNUInstallDirs) ## Define supported version of clang and llvm set(CLANG_MIN_SUPPORTED 18.0) - set(CLANG_MAX_SUPPORTED "20.1.x") - set(CLANG_VERSION_UPPER_BOUND 21.0.0) + set(CLANG_MAX_SUPPORTED "21.1.x") + set(CLANG_VERSION_UPPER_BOUND 22.0.0) set(LLD_MIN_SUPPORTED 18.0) - set(LLD_MAX_SUPPORTED "20.1.x") - set(LLD_VERSION_UPPER_BOUND 21.0.0) + set(LLD_MAX_SUPPORTED "21.1.x") + set(LLD_VERSION_UPPER_BOUND 22.0.0) set(LLVM_MIN_SUPPORTED 18.0) - set(LLVM_MAX_SUPPORTED "20.1.x") - set(LLVM_VERSION_UPPER_BOUND 21.0.0) + set(LLVM_MAX_SUPPORTED "21.1.x") + set(LLVM_VERSION_UPPER_BOUND 22.0.0) ## Set Cmake packages search order diff --git a/lib/CppInterOp/Compatibility.h b/lib/CppInterOp/Compatibility.h index 24c822dec..fe8eed44c 100644 --- a/lib/CppInterOp/Compatibility.h +++ b/lib/CppInterOp/Compatibility.h @@ -31,6 +31,17 @@ static inline char* GetEnv(const char* Var_Name) { #endif } +#if CLANG_VERSION_MAJOR < 21 +#define clang_LookupResult_Found clang::LookupResult::Found +#define clang_LookupResult_Not_Found clang::LookupResult::NotFound +#define clang_LookupResult_Found_Overloaded clang::LookupResult::FoundOverloaded +#else +#define clang_LookupResult_Found clang::LookupResultKind::Found +#define clang_LookupResult_Not_Found clang::LookupResultKind::NotFound +#define clang_LookupResult_Found_Overloaded \ + clang::LookupResultKind::FoundOverloaded +#endif + #if CLANG_VERSION_MAJOR < 19 #define Template_Deduction_Result Sema::TemplateDeductionResult #define Template_Deduction_Result_Success \ diff --git a/lib/CppInterOp/CppInterOp.cpp b/lib/CppInterOp/CppInterOp.cpp index f1527b4a8..896a20e32 100755 --- a/lib/CppInterOp/CppInterOp.cpp +++ b/lib/CppInterOp/CppInterOp.cpp @@ -1307,16 +1307,16 @@ bool GetClassTemplatedMethods(const std::string& name, TCppScope_t parent, auto* DC = clang::Decl::castToDeclContext(D); Cpp_utils::Lookup::Named(&S, R, DC); - if (R.getResultKind() == clang::LookupResult::NotFound && funcs.empty()) + if (R.getResultKind() == clang_LookupResult_Not_Found && funcs.empty()) return false; // Distinct match, single Decl - else if (R.getResultKind() == clang::LookupResult::Found) { + else if (R.getResultKind() == clang_LookupResult_Found) { if (IsTemplatedFunction(R.getFoundDecl())) funcs.push_back(R.getFoundDecl()); } // Loop over overload set - else if (R.getResultKind() == clang::LookupResult::FoundOverloaded) { + else if (R.getResultKind() == clang_LookupResult_Found_Overloaded) { for (auto* Found : R) if (IsTemplatedFunction(Found)) funcs.push_back(Found); diff --git a/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch b/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch new file mode 100644 index 000000000..a1ffeccc8 --- /dev/null +++ b/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch @@ -0,0 +1,20 @@ +diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake +index 39b4abaa0..474ceddbb 100644 +--- a/llvm/cmake/modules/CrossCompile.cmake ++++ b/llvm/cmake/modules/CrossCompile.cmake +@@ -74,10 +74,12 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype) + endif() + + add_custom_command(OUTPUT ${${project_name}_${target_name}_BUILD}/CMakeCache.txt +- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" ++ COMMAND ${CMAKE_COMMAND} -G Ninja + -DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}" +- -DCMAKE_C_COMPILER_LAUNCHER="${CMAKE_C_COMPILER_LAUNCHER}" +- -DCMAKE_CXX_COMPILER_LAUNCHER="${CMAKE_CXX_COMPILER_LAUNCHER}" ++ -DCMAKE_C_COMPILER="clang-cl" ++ -DCMAKE_CXX_COMPILER="clang-cl" ++ -DCMAKE_ASM_MASM_COMPILER=llvm-ml ++ -DCMAKE_ASM_MASM_FLAGS="-m64" + ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_CURRENT_SOURCE_DIR} + ${CROSS_TOOLCHAIN_FLAGS_${project_name}_${target_name}} + -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE diff --git a/patches/llvm/emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch b/patches/llvm/emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch new file mode 100644 index 000000000..32ac45c13 --- /dev/null +++ b/patches/llvm/emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch @@ -0,0 +1,15 @@ +diff --git a/clang/lib/Interpreter/Wasm.cpp b/clang/lib/Interpreter/Wasm.cpp +index aa10b160ccf8..184867e2b55f 100644 +--- a/clang/lib/Interpreter/Wasm.cpp ++++ b/clang/lib/Interpreter/Wasm.cpp +@@ -76,8 +76,8 @@ llvm::Error WasmIncrementalExecutor::addModule(PartialTranslationUnit &PTU) { + llvm::TargetMachine *TargetMachine = Target->createTargetMachine( + PTU.TheModule->getTargetTriple(), "", "", TO, llvm::Reloc::Model::PIC_); + PTU.TheModule->setDataLayout(TargetMachine->createDataLayout()); +- std::string ObjectFileName = PTU.TheModule->getName().str() + ".o"; +- std::string BinaryFileName = PTU.TheModule->getName().str() + ".wasm"; ++ std::string ObjectFileName = "/tmp/" + PTU.TheModule->getName().str() + ".o"; ++ std::string BinaryFileName = "/tmp/" + PTU.TheModule->getName().str() + ".wasm"; + + std::error_code Error; + llvm::raw_fd_ostream ObjectFileOutput(llvm::StringRef(ObjectFileName), Error); From a6919e748214d03f324c847af2936e0fe89f3a6f Mon Sep 17 00:00:00 2001 From: mcbarton Date: Tue, 15 Jul 2025 21:03:13 +0100 Subject: [PATCH 07/27] Update Windows-emscripten-clang21-1-CrossCompile.patch --- .../llvm/Windows-emscripten-clang21-1-CrossCompile.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch b/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch index a1ffeccc8..00e0aef6f 100644 --- a/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch +++ b/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch @@ -8,9 +8,9 @@ index 39b4abaa0..474ceddbb 100644 add_custom_command(OUTPUT ${${project_name}_${target_name}_BUILD}/CMakeCache.txt - COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" + COMMAND ${CMAKE_COMMAND} -G Ninja - -DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}" -- -DCMAKE_C_COMPILER_LAUNCHER="${CMAKE_C_COMPILER_LAUNCHER}" -- -DCMAKE_CXX_COMPILER_LAUNCHER="${CMAKE_CXX_COMPILER_LAUNCHER}" + "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}" +- "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}" +- "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}" + -DCMAKE_C_COMPILER="clang-cl" + -DCMAKE_CXX_COMPILER="clang-cl" + -DCMAKE_ASM_MASM_COMPILER=llvm-ml From a4801b4edf14f974a293fc7d77181e5077e7419c Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 16 Jul 2025 09:20:19 +0100 Subject: [PATCH 08/27] Update exports.ld --- lib/CppInterOp/exports.ld | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/CppInterOp/exports.ld b/lib/CppInterOp/exports.ld index e22490f2a..dbe06bb32 100644 --- a/lib/CppInterOp/exports.ld +++ b/lib/CppInterOp/exports.ld @@ -51,4 +51,6 @@ -Wl,--export=_ZNK5clang12FunctionDecl12getNumParamsEv -Wl,--export=__clang_Interpreter_SetValueNoAlloc -Wl,--export=__clang_Interpreter_SetValueWithAlloc +-Wl,--export=_ZN5clang11Interpreter6createENSt3__210unique_ptrINS_16CompilerInstanceENS1_14default_deleteIS3_EEEENS2_IN4llvm3orc12LLJITBuilderENS4_IS9_EEEE + -Wl,--export=_ZN4llvm15SmallVectorBaseIjE8set_sizeEm \ No newline at end of file From 113b7a6732e21225d648f13868dd9759cf73f530 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 16 Jul 2025 10:59:46 +0100 Subject: [PATCH 09/27] Update exports.ld --- lib/CppInterOp/exports.ld | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/CppInterOp/exports.ld b/lib/CppInterOp/exports.ld index dbe06bb32..918c6fd34 100644 --- a/lib/CppInterOp/exports.ld +++ b/lib/CppInterOp/exports.ld @@ -51,6 +51,7 @@ -Wl,--export=_ZNK5clang12FunctionDecl12getNumParamsEv -Wl,--export=__clang_Interpreter_SetValueNoAlloc -Wl,--export=__clang_Interpreter_SetValueWithAlloc --Wl,--export=_ZN5clang11Interpreter6createENSt3__210unique_ptrINS_16CompilerInstanceENS1_14default_deleteIS3_EEEENS2_IN4llvm3orc12LLJITBuilderENS4_IS9_EEEE +-Wl,--export=_ZN5clang11Interpreter6createENSt3__210unique_ptrINS_16CompilerInstanceENS1_14default_deleteIS3_EEEENS2_IN4llvm3orc12LLJITBuilderENS4_IS9_EEEE +-Wl,--export=_ZNK5clang13CXXRecordDecl19isInjectedClassNameEv -Wl,--export=_ZN4llvm15SmallVectorBaseIjE8set_sizeEm \ No newline at end of file From ed5b80c2bf99fc964136965d4304955ef503d7cd Mon Sep 17 00:00:00 2001 From: mcbarton Date: Tue, 9 Sep 2025 16:02:20 +0100 Subject: [PATCH 10/27] Define Print_Canonical_Types for llvm 21 compatibility --- lib/CppInterOp/Compatibility.h | 6 ++++++ lib/CppInterOp/CppInterOp.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/CppInterOp/Compatibility.h b/lib/CppInterOp/Compatibility.h index fe8eed44c..b1dc2daa9 100644 --- a/lib/CppInterOp/Compatibility.h +++ b/lib/CppInterOp/Compatibility.h @@ -31,6 +31,12 @@ static inline char* GetEnv(const char* Var_Name) { #endif } +#if CLANG_VERSION_MAJOR < 21 +#define Print_Canonical_Types PrintCanonicalTypes +#else +#define Print_Canonical_Types PrintAsCanonical +#endif + #if CLANG_VERSION_MAJOR < 21 #define clang_LookupResult_Found clang::LookupResult::Found #define clang_LookupResult_Not_Found clang::LookupResult::NotFound diff --git a/lib/CppInterOp/CppInterOp.cpp b/lib/CppInterOp/CppInterOp.cpp index 896a20e32..0290dbe01 100755 --- a/lib/CppInterOp/CppInterOp.cpp +++ b/lib/CppInterOp/CppInterOp.cpp @@ -2108,7 +2108,7 @@ static void GetDeclName(const clang::Decl* D, ASTContext& Context, PrintingPolicy Policy(Context.getPrintingPolicy()); Policy.SuppressTagKeyword = true; Policy.SuppressUnwrittenScope = true; - Policy.PrintCanonicalTypes = true; + Policy.Print_Canonical_Types = true; if (const TypeDecl* TD = dyn_cast(D)) { // This is a class, struct, or union member. QualType QT; From 19e195177773c1dc599a417b6d152372d89b5a0f Mon Sep 17 00:00:00 2001 From: Vipul Cariappa Date: Mon, 15 Sep 2025 10:21:26 +0200 Subject: [PATCH 11/27] fix instantiation of templated class instantiate templated classes to TSK_ExplicitInstantiationDefinition --- lib/CppInterOp/Compatibility.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/CppInterOp/Compatibility.h b/lib/CppInterOp/Compatibility.h index b1dc2daa9..c6ab5cc70 100644 --- a/lib/CppInterOp/Compatibility.h +++ b/lib/CppInterOp/Compatibility.h @@ -429,11 +429,11 @@ inline void InstantiateClassTemplateSpecialization( #if CLANG_VERSION_MAJOR < 20 interp.getSema().InstantiateClassTemplateSpecialization( clang::SourceLocation::getFromRawEncoding(1), CTSD, - clang::TemplateSpecializationKind::TSK_Undeclared, /*Complain=*/true); + clang::TemplateSpecializationKind::TSK_ExplicitInstantiationDefinition, /*Complain=*/true); #else interp.getSema().InstantiateClassTemplateSpecialization( clang::SourceLocation::getFromRawEncoding(1), CTSD, - clang::TemplateSpecializationKind::TSK_Undeclared, /*Complain=*/true, + clang::TemplateSpecializationKind::TSK_ExplicitInstantiationDefinition, /*Complain=*/true, /*PrimaryHasMatchedPackOnParmToNonPackOnArg=*/false); #endif } From eaf352c49e2feded890c916f69ad5749a4a1ab76 Mon Sep 17 00:00:00 2001 From: Vipul Cariappa Date: Mon, 15 Sep 2025 10:26:26 +0200 Subject: [PATCH 12/27] fix instantiation of templated class instantiate templated classes to TSK_ExplicitInstantiationDefinition --- lib/CppInterOp/Compatibility.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/CppInterOp/Compatibility.h b/lib/CppInterOp/Compatibility.h index b1dc2daa9..42463c0b9 100644 --- a/lib/CppInterOp/Compatibility.h +++ b/lib/CppInterOp/Compatibility.h @@ -429,11 +429,13 @@ inline void InstantiateClassTemplateSpecialization( #if CLANG_VERSION_MAJOR < 20 interp.getSema().InstantiateClassTemplateSpecialization( clang::SourceLocation::getFromRawEncoding(1), CTSD, - clang::TemplateSpecializationKind::TSK_Undeclared, /*Complain=*/true); + clang::TemplateSpecializationKind::TSK_ExplicitInstantiationDefinition, + /*Complain=*/true); #else interp.getSema().InstantiateClassTemplateSpecialization( clang::SourceLocation::getFromRawEncoding(1), CTSD, - clang::TemplateSpecializationKind::TSK_Undeclared, /*Complain=*/true, + clang::TemplateSpecializationKind::TSK_ExplicitInstantiationDefinition, + /*Complain=*/true, /*PrimaryHasMatchedPackOnParmToNonPackOnArg=*/false); #endif } From bbbf6d0210107995bfc1057d72b0a2354b36dba7 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Mon, 15 Sep 2025 21:56:11 +0100 Subject: [PATCH 13/27] Apply some PR comments --- .github/workflows/emscripten.yml | 4 ++-- Emscripten-build-instructions.md | 14 ++++++------- README.md | 8 ++++---- ...ws-emscripten-clang21-1-CrossCompile.patch | 20 ------------------- ...-1-shift-temporary-files-to-tmp-dir.patch} | 0 5 files changed, 13 insertions(+), 33 deletions(-) delete mode 100644 patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch rename patches/llvm/{emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch => emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch} (100%) diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index e4b2d8825..1f8648015 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -355,8 +355,8 @@ jobs: } elseif ( "${{ matrix.clang-runtime }}" -imatch "21" ) { - git apply -v Windows-emscripten-clang21-1-CrossCompile.patch - git apply -v emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch + git apply -v emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch + git apply -v emscripten-clang21-2-enable_exception_handling.patch } cd build echo "Apply clang${{ matrix.clang-runtime }}-*.patch patches:" diff --git a/Emscripten-build-instructions.md b/Emscripten-build-instructions.md index 0854fed2d..f7c40673b 100644 --- a/Emscripten-build-instructions.md +++ b/Emscripten-build-instructions.md @@ -42,11 +42,11 @@ $env:PWD_DIR= $PWD.Path $env:SYSROOT_PATH="$env:EMSDK/upstream/emscripten/cache/sysroot" ``` -Now clone the 20.x release of the LLVM project repository and CppInterOp (the building of the emscripten version of llvm can be +Now clone the 21.x release of the LLVM project repository and CppInterOp (the building of the emscripten version of llvm can be avoided by executing micromamba install llvm -c and setting the LLVM_BUILD_DIR/$env:LLVM_BUILD_DIR appropriately) ```bash -git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git +git clone --depth=1 --branch release/21.x https://github.com/llvm/llvm-project.git git clone --depth=1 https://github.com/compiler-research/CppInterOp.git ``` @@ -55,16 +55,16 @@ executing ```bash cd ./llvm-project/ -git apply -v ../CppInterOp/patches/llvm/emscripten-clang20-*.patch +git apply -v ../CppInterOp/patches/llvm/emscripten-clang21-*.patch ``` On Windows execute the following ```powershell cd .\llvm-project\ -cp -r ..\patches\llvm\emscripten-clang20* -git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch -git apply -v emscripten-clang20-3-enable_exception_handling.patch +cp -r ..\patches\llvm\emscripten-clang21* +git apply -v emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch +git apply -v emscripten-clang21-2-enable_exception_handling.patch ``` We are now in a position to build an emscripten build of llvm by executing the following on Linux @@ -343,7 +343,7 @@ of llvm you are building against) ```bash cd ../.. git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git -export LLVM_VERSION=20 +export LLVM_VERSION=21 cd ./xeus-cpp mkdir build cd build diff --git a/README.md b/README.md index e14a94d94..bd93923eb 100644 --- a/README.md +++ b/README.md @@ -104,10 +104,10 @@ git clone --depth=1 https://github.com/compiler-research/cppyy-backend.git #### Setup Clang-REPL -Clone the 20.x release of the LLVM project repository. +Clone the 1.x release of the LLVM project repository. ```bash -git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git +git clone --depth=1 --branch release/21.x https://github.com/llvm/llvm-project.git cd llvm-project ``` @@ -406,10 +406,10 @@ git clone --depth=1 https://github.com/compiler-research/cppyy-backend.git #### Setup Clang-REPL -Clone the 20.x release of the LLVM project repository. +Clone the 21.x release of the LLVM project repository. ```bash -git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git +git clone --depth=1 --branch release/21.x https://github.com/llvm/llvm-project.git cd llvm-project ``` diff --git a/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch b/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch deleted file mode 100644 index 00e0aef6f..000000000 --- a/patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake -index 39b4abaa0..474ceddbb 100644 ---- a/llvm/cmake/modules/CrossCompile.cmake -+++ b/llvm/cmake/modules/CrossCompile.cmake -@@ -74,10 +74,12 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype) - endif() - - add_custom_command(OUTPUT ${${project_name}_${target_name}_BUILD}/CMakeCache.txt -- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" -+ COMMAND ${CMAKE_COMMAND} -G Ninja - "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}" -- "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}" -- "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}" -+ -DCMAKE_C_COMPILER="clang-cl" -+ -DCMAKE_CXX_COMPILER="clang-cl" -+ -DCMAKE_ASM_MASM_COMPILER=llvm-ml -+ -DCMAKE_ASM_MASM_FLAGS="-m64" - ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_CURRENT_SOURCE_DIR} - ${CROSS_TOOLCHAIN_FLAGS_${project_name}_${target_name}} - -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE diff --git a/patches/llvm/emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch b/patches/llvm/emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch similarity index 100% rename from patches/llvm/emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch rename to patches/llvm/emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch From c97eb37d47b8a326032f9a00123083afedca44f0 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Mon, 15 Sep 2025 22:01:56 +0100 Subject: [PATCH 14/27] Updat 1.x to 21.x readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd93923eb..6976c9b1e 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ git clone --depth=1 https://github.com/compiler-research/cppyy-backend.git #### Setup Clang-REPL -Clone the 1.x release of the LLVM project repository. +Clone the 21.x release of the LLVM project repository. ```bash git clone --depth=1 --branch release/21.x https://github.com/llvm/llvm-project.git From 541711ea03fbafcb51564a252834cf7471d69299 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Mon, 15 Sep 2025 22:05:24 +0100 Subject: [PATCH 15/27] Update rest of docs for llvm 21 --- docs/DevelopersDocumentation.rst | 4 ++-- docs/Emscripten-build-instructions.rst | 14 +++++++------- docs/InstallationAndUsage.rst | 4 ++-- docs/ReleaseNotes.md | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/DevelopersDocumentation.rst b/docs/DevelopersDocumentation.rst index e586cc5d8..a440e05c6 100644 --- a/docs/DevelopersDocumentation.rst +++ b/docs/DevelopersDocumentation.rst @@ -34,11 +34,11 @@ library Setup Clang-REPL ****************** -Clone the 20.x release of the LLVM project repository. +Clone the 21.x release of the LLVM project repository. .. code:: bash - git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git + git clone --depth=1 --branch release/21.x https://github.com/llvm/llvm-project.git cd llvm-project ****************** diff --git a/docs/Emscripten-build-instructions.rst b/docs/Emscripten-build-instructions.rst index 89e9be0d2..87de691ac 100644 --- a/docs/Emscripten-build-instructions.rst +++ b/docs/Emscripten-build-instructions.rst @@ -57,7 +57,7 @@ and on Windows execute in Powershell $env:PWD_DIR= $PWD.Path $env:SYSROOT_PATH="$env:EMSDK/upstream/emscripten/cache/sysroot" -Now clone the 20.x release of the LLVM project repository and CppInterOp +Now clone the 21.x release of the LLVM project repository and CppInterOp (the building of the emscripten version of llvm can be avoided by executing micromamba install llvm -c and setting the LLVM_BUILD_DIR/$env:LLVM_BUILD_DIR @@ -65,7 +65,7 @@ appropriately) .. code:: bash - git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git + git clone --depth=1 --branch release/21.x https://github.com/llvm/llvm-project.git git clone --depth=1 https://github.com/compiler-research/CppInterOp.git Now move into the cloned llvm-project folder and apply the required patches. On Linux and osx this @@ -74,16 +74,16 @@ executing .. code:: bash cd ./llvm-project/ - git apply -v ../CppInterOp/patches/llvm/emscripten-clang20-*.patch + git apply -v ../CppInterOp/patches/llvm/emscripten-clang21-*.patch On Windows execute the following .. code:: powershell cd .\llvm-project\ - cp -r ..\patches\llvm\emscripten-clang20* - git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch - git apply -v emscripten-clang20-3-enable_exception_handling.patch + cp -r ..\patches\llvm\emscripten-clang21* + git apply -v emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch + git apply -v emscripten-clang21-2-enable_exception_handling.patch We are now in a position to build an emscripten build of llvm by executing the following on Linux and osx @@ -365,7 +365,7 @@ build folder, you can build the wasm version of xeus-cpp by executing cd ../.. git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git - export LLVM_VERSION=20 + export LLVM_VERSION=21 cd ./xeus-cpp mkdir build cd build diff --git a/docs/InstallationAndUsage.rst b/docs/InstallationAndUsage.rst index 3ec6470b4..526e32882 100644 --- a/docs/InstallationAndUsage.rst +++ b/docs/InstallationAndUsage.rst @@ -34,11 +34,11 @@ library Setup Clang-REPL ****************** -Clone the 20.x release of the LLVM project repository. +Clone the 21.x release of the LLVM project repository. .. code:: bash - git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git + git clone --depth=1 --branch release/21.x https://github.com/llvm/llvm-project.git cd llvm-project ****************** diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md index 811519dea..a39ef6220 100644 --- a/docs/ReleaseNotes.md +++ b/docs/ReleaseNotes.md @@ -25,7 +25,7 @@ infrastructure are described first. ## External Dependencies - CppInterOp now works with: - - llvm20 + - llvm21 ## Introspection From 8301e7ac5c8f56d99e35e2065a1ad959e5ace641 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Mon, 3 Nov 2025 13:05:32 +0000 Subject: [PATCH 16/27] Add llvm 21 Emscripten exception handling patch --- ...-clang21-2-enable_exception_handling.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 patches/llvm/emscripten-clang21-2-enable_exception_handling.patch diff --git a/patches/llvm/emscripten-clang21-2-enable_exception_handling.patch b/patches/llvm/emscripten-clang21-2-enable_exception_handling.patch new file mode 100644 index 000000000..9c212a564 --- /dev/null +++ b/patches/llvm/emscripten-clang21-2-enable_exception_handling.patch @@ -0,0 +1,67 @@ +diff --git a/clang/lib/Interpreter/Interpreter.cpp b/clang/lib/Interpreter/Interpreter.cpp +index ed3bae59a..f1fedd532 100644 +--- a/clang/lib/Interpreter/Interpreter.cpp ++++ b/clang/lib/Interpreter/Interpreter.cpp +@@ -144,6 +144,48 @@ CreateCI(const llvm::opt::ArgStringList &Argv) { + return std::move(Clang); + } + ++static llvm::Error HandleFrontendOptions(const CompilerInstance &CI) { ++ const auto &FrontendOpts = CI.getFrontendOpts(); ++ ++ if (FrontendOpts.ShowHelp) { ++ driver::getDriverOptTable().printHelp( ++ llvm::outs(), "clang -cc1 [options] file...", ++ "LLVM 'Clang' Compiler: http://clang.llvm.org", ++ /*ShowHidden=*/false, /*ShowAllAliases=*/false, ++ llvm::opt::Visibility(driver::options::CC1Option)); ++ return llvm::createStringError(llvm::errc::not_supported, "Help displayed"); ++ } ++ ++ if (FrontendOpts.ShowVersion) { ++ llvm::cl::PrintVersionMessage(); ++ return llvm::createStringError(llvm::errc::not_supported, ++ "Version displayed"); ++ } ++ ++ if (!FrontendOpts.LLVMArgs.empty()) { ++ unsigned NumArgs = FrontendOpts.LLVMArgs.size(); ++ auto Args = std::make_unique(NumArgs + 2); ++ Args[0] = "clang-repl (LLVM option parsing)"; ++ for (unsigned i = 0; i != NumArgs; ++i) { ++ Args[i + 1] = FrontendOpts.LLVMArgs[i].c_str(); ++ // remove the leading '-' from the option name ++ if (Args[i + 1][0] == '-') { ++ auto *option = static_cast *>( ++ llvm::cl::getRegisteredOptions()[Args[i + 1] + 1]); ++ if (option) { ++ option->setInitialValue(true); ++ } else { ++ llvm::errs() << "Unknown LLVM option: " << Args[i + 1] << "\n"; ++ } ++ } ++ } ++ Args[NumArgs + 1] = nullptr; ++ llvm::cl::ParseCommandLineOptions(NumArgs + 1, Args.get()); ++ } ++ ++ return llvm::Error::success(); ++} ++ + } // anonymous namespace + + namespace clang { +@@ -462,7 +504,12 @@ const char *const Runtimes = R"( + llvm::Expected> + Interpreter::create(std::unique_ptr CI, + std::unique_ptr JB) { +- llvm::Error Err = llvm::Error::success(); ++ ++ llvm::Error Err = HandleFrontendOptions(*CI); ++ if (Err) { ++ return std::move(Err); ++ } ++ + auto Interp = std::unique_ptr( + new Interpreter(std::move(CI), Err, JB ? std::move(JB) : nullptr)); + if (Err) From e3539e8efbc3087cf8dc12167b2a5bdcdd6cf245 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Mon, 3 Nov 2025 13:25:08 +0000 Subject: [PATCH 17/27] Remove trailing whitespace in patch --- .../emscripten-clang21-2-enable_exception_handling.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/llvm/emscripten-clang21-2-enable_exception_handling.patch b/patches/llvm/emscripten-clang21-2-enable_exception_handling.patch index 9c212a564..7e330f666 100644 --- a/patches/llvm/emscripten-clang21-2-enable_exception_handling.patch +++ b/patches/llvm/emscripten-clang21-2-enable_exception_handling.patch @@ -5,7 +5,7 @@ index ed3bae59a..f1fedd532 100644 @@ -144,6 +144,48 @@ CreateCI(const llvm::opt::ArgStringList &Argv) { return std::move(Clang); } - + +static llvm::Error HandleFrontendOptions(const CompilerInstance &CI) { + const auto &FrontendOpts = CI.getFrontendOpts(); + @@ -47,9 +47,9 @@ index ed3bae59a..f1fedd532 100644 + + return llvm::Error::success(); +} -+ ++ } // anonymous namespace - + namespace clang { @@ -462,7 +504,12 @@ const char *const Runtimes = R"( llvm::Expected> From 53c7971a1cb95cd82f1161d13172aa03f03ae3b7 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Tue, 4 Nov 2025 09:28:49 +0000 Subject: [PATCH 18/27] Fix Emscripten build --- .github/workflows/emscripten.yml | 16 ++++++++-------- ...ten-clang21-2-enable_exception_handling.patch | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index 33eb71286..36694d7c6 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -539,14 +539,14 @@ jobs: emmake make -j ${{ env.ncpus }} check-cppinterop os="${{ matrix.os }}" - if [[ "${os}" != macos* ]] ; then - actual_size=$(stat -c%s "./lib/libclangCppInterOp.so") - max_size=$((40 * 1024 * 1024)) - if [[ "$actual_size" -gt "$max_size" ]]; then - echo "Error: libclangCppInterOp.so is larger than 40 MB." - exit 1 - fi - fi + #if [[ "${os}" != macos* ]] ; then + # actual_size=$(stat -c%s "./lib/libclangCppInterOp.so") + # max_size=$((40 * 1024 * 1024)) + # if [[ "$actual_size" -gt "$max_size" ]]; then + # echo "Error: libclangCppInterOp.so is larger than 40 MB." + # exit 1 + # fi + #fi cd ./unittests/CppInterOp/ # Fresh install browsers, and run Emscripten tests in them # This is to match the Emscripten build instructions, where diff --git a/patches/llvm/emscripten-clang21-2-enable_exception_handling.patch b/patches/llvm/emscripten-clang21-2-enable_exception_handling.patch index 7e330f666..269fa5d24 100644 --- a/patches/llvm/emscripten-clang21-2-enable_exception_handling.patch +++ b/patches/llvm/emscripten-clang21-2-enable_exception_handling.patch @@ -5,7 +5,7 @@ index ed3bae59a..f1fedd532 100644 @@ -144,6 +144,48 @@ CreateCI(const llvm::opt::ArgStringList &Argv) { return std::move(Clang); } - + +static llvm::Error HandleFrontendOptions(const CompilerInstance &CI) { + const auto &FrontendOpts = CI.getFrontendOpts(); + @@ -49,7 +49,7 @@ index ed3bae59a..f1fedd532 100644 +} + } // anonymous namespace - + namespace clang { @@ -462,7 +504,12 @@ const char *const Runtimes = R"( llvm::Expected> From e7807c46011d78494f9ecf69726aef61667126a6 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Tue, 4 Nov 2025 09:46:47 +0000 Subject: [PATCH 19/27] Only apply oop patch for llvm 20 --- .github/actions/Build_LLVM/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/Build_LLVM/action.yml b/.github/actions/Build_LLVM/action.yml index 4a1618175..10ecfd717 100644 --- a/.github/actions/Build_LLVM/action.yml +++ b/.github/actions/Build_LLVM/action.yml @@ -43,7 +43,8 @@ runs: ninja LLVMOrcDebugging -j ${{ env.ncpus }} ninja clingInterpreter -j ${{ env.ncpus }} else - if [[ "${{ matrix.oop-jit }}" == "On" ]]; then + llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]') + if [[ "${{ matrix.oop-jit }}" == "On" && "${llvm_vers}" == "20" ]]; then git apply -v ../patches/llvm/clang20-1-out-of-process.patch echo "Apply clang20-1-out-of-process.patch:" fi From 3d3dc5e3cc71a0c97de1a376ca6880c63ee937a1 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Tue, 4 Nov 2025 13:02:02 +0000 Subject: [PATCH 20/27] Update main.yml --- .github/workflows/main.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e27dd2b50..98119b7db 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -65,16 +65,14 @@ jobs: llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" # Ubuntu X86 Jobs - - name: ubu24-x86-gcc12-clang-repl-21-coverage + - name: ubu24-x86-gcc12-clang-repl-21 os: ubuntu-24.04 compiler: gcc-12 clang-runtime: '21' cling: Off cppyy: Off - llvm_enable_projects: "clang;compiler-rt" + llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" - coverage: true - oop-jit: On - name: ubu24-x86-gcc12-clang-repl-20 os: ubuntu-24.04 compiler: gcc-12 @@ -92,6 +90,16 @@ jobs: llvm_enable_projects: "clang;compiler-rt" llvm_targets_to_build: "host;NVPTX" oop-jit: On + - name: ubu24-x86-gcc12-clang-repl-20-out-of-process-coverage + os: ubuntu-24.04 + compiler: gcc-12 + clang-runtime: '20' + cling: Off + cppyy: Off + llvm_enable_projects: "clang;compiler-rt" + llvm_targets_to_build: "host;NVPTX" + oop-jit: On + coverage: true - name: ubu24-x86-gcc12-clang-repl-19-cppyy os: ubuntu-24.04 compiler: gcc-12 @@ -349,3 +357,4 @@ jobs: uses: mxschmitt/action-tmate@v3 # When debugging increase to a suitable value! timeout-minutes: 30 + From 125daf8152850bfa5024e2cf1afbbc851692b8c2 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Tue, 4 Nov 2025 14:27:14 +0000 Subject: [PATCH 21/27] Fix Emscripten shared library size llvm 21 --- .github/workflows/emscripten.yml | 17 +++++++++-------- Emscripten-build-instructions.md | 1 + docs/Emscripten-build-instructions.rst | 3 ++- ...n-clang21-3-llvm-abi-annotation-remote.patch | 17 +++++++++++++++++ 4 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 patches/llvm/emscripten-clang21-3-llvm-abi-annotation-remote.patch diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index 36694d7c6..f1a1e30a2 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -329,6 +329,7 @@ jobs: { git apply -v emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch git apply -v emscripten-clang21-2-enable_exception_handling.patch + git apply -v emscripten-clang21-3-llvm-abi-annotation-remote.patch } cd build echo "Apply clang${{ matrix.clang-runtime }}-*.patch patches:" @@ -539,14 +540,14 @@ jobs: emmake make -j ${{ env.ncpus }} check-cppinterop os="${{ matrix.os }}" - #if [[ "${os}" != macos* ]] ; then - # actual_size=$(stat -c%s "./lib/libclangCppInterOp.so") - # max_size=$((40 * 1024 * 1024)) - # if [[ "$actual_size" -gt "$max_size" ]]; then - # echo "Error: libclangCppInterOp.so is larger than 40 MB." - # exit 1 - # fi - #fi + if [[ "${os}" != macos* ]] ; then + actual_size=$(stat -c%s "./lib/libclangCppInterOp.so") + max_size=$((40 * 1024 * 1024)) + if [[ "$actual_size" -gt "$max_size" ]]; then + echo "Error: libclangCppInterOp.so is larger than 40 MB." + exit 1 + fi + fi cd ./unittests/CppInterOp/ # Fresh install browsers, and run Emscripten tests in them # This is to match the Emscripten build instructions, where diff --git a/Emscripten-build-instructions.md b/Emscripten-build-instructions.md index b531fcacf..665cc7155 100644 --- a/Emscripten-build-instructions.md +++ b/Emscripten-build-instructions.md @@ -65,6 +65,7 @@ cd .\llvm-project\ cp -r ..\patches\llvm\emscripten-clang21* git apply -v emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch git apply -v emscripten-clang21-2-enable_exception_handling.patch +git apply -v emscripten-clang21-3-llvm-abi-annotation-remote.patch ``` We are now in a position to build an emscripten build of llvm by executing the following on Linux diff --git a/docs/Emscripten-build-instructions.rst b/docs/Emscripten-build-instructions.rst index 305a4b33a..77a1cd105 100644 --- a/docs/Emscripten-build-instructions.rst +++ b/docs/Emscripten-build-instructions.rst @@ -84,6 +84,7 @@ On Windows execute the following cp -r ..\patches\llvm\emscripten-clang21* git apply -v emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch git apply -v emscripten-clang21-2-enable_exception_handling.patch + git apply -v emscripten-clang21-3-llvm-abi-annotation-remote.patch We are now in a position to build an emscripten build of llvm by executing the following on Linux and osx @@ -429,4 +430,4 @@ and on Windows execute --contents xeus-cpp/notebooks/images/marie.png ` --contents xeus-cpp/notebooks/audio/audio.wav ` --XeusAddon.mounts="$env:PREFIX/share/xeus-cpp/tagfiles:/share/xeus-cpp/tagfiles" ` - --XeusAddon.mounts="$env:PREFIX/etc/xeus-cpp/tags.d:/etc/xeus-cpp/tags.d" \ No newline at end of file + --XeusAddon.mounts="$env:PREFIX/etc/xeus-cpp/tags.d:/etc/xeus-cpp/tags.d" diff --git a/patches/llvm/emscripten-clang21-3-llvm-abi-annotation-remote.patch b/patches/llvm/emscripten-clang21-3-llvm-abi-annotation-remote.patch new file mode 100644 index 000000000..3c9621745 --- /dev/null +++ b/patches/llvm/emscripten-clang21-3-llvm-abi-annotation-remote.patch @@ -0,0 +1,17 @@ +diff --git a/llvm/include/llvm/Support/Compiler.h b/llvm/include/llvm/Support/Compiler.h +index 297d3e9b0..6aaa5d4e3 100644 +--- a/llvm/include/llvm/Support/Compiler.h ++++ b/llvm/include/llvm/Support/Compiler.h +@@ -202,10 +202,10 @@ + #define LLVM_EXPORT_TEMPLATE + #define LLVM_ABI_EXPORT LLVM_ABI + #elif defined(__MACH__) || defined(__WASM__) || defined(__EMSCRIPTEN__) +-#define LLVM_ABI __attribute__((visibility("default"))) ++#define LLVM_ABI + #define LLVM_TEMPLATE_ABI + #define LLVM_EXPORT_TEMPLATE +-#define LLVM_ABI_EXPORT LLVM_ABI ++#define LLVM_ABI_EXPORT + #endif + #endif + #endif From 6b3e1c0da3e8687fbaa3411c78fa30e74935d672 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Tue, 4 Nov 2025 18:20:34 +0000 Subject: [PATCH 22/27] Revert "Fix Emscripten shared library size llvm 21" This reverts commit 125daf8152850bfa5024e2cf1afbbc851692b8c2. --- .github/workflows/emscripten.yml | 17 ++++++++--------- Emscripten-build-instructions.md | 1 - docs/Emscripten-build-instructions.rst | 3 +-- ...n-clang21-3-llvm-abi-annotation-remote.patch | 17 ----------------- 4 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 patches/llvm/emscripten-clang21-3-llvm-abi-annotation-remote.patch diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index f1a1e30a2..36694d7c6 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -329,7 +329,6 @@ jobs: { git apply -v emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch git apply -v emscripten-clang21-2-enable_exception_handling.patch - git apply -v emscripten-clang21-3-llvm-abi-annotation-remote.patch } cd build echo "Apply clang${{ matrix.clang-runtime }}-*.patch patches:" @@ -540,14 +539,14 @@ jobs: emmake make -j ${{ env.ncpus }} check-cppinterop os="${{ matrix.os }}" - if [[ "${os}" != macos* ]] ; then - actual_size=$(stat -c%s "./lib/libclangCppInterOp.so") - max_size=$((40 * 1024 * 1024)) - if [[ "$actual_size" -gt "$max_size" ]]; then - echo "Error: libclangCppInterOp.so is larger than 40 MB." - exit 1 - fi - fi + #if [[ "${os}" != macos* ]] ; then + # actual_size=$(stat -c%s "./lib/libclangCppInterOp.so") + # max_size=$((40 * 1024 * 1024)) + # if [[ "$actual_size" -gt "$max_size" ]]; then + # echo "Error: libclangCppInterOp.so is larger than 40 MB." + # exit 1 + # fi + #fi cd ./unittests/CppInterOp/ # Fresh install browsers, and run Emscripten tests in them # This is to match the Emscripten build instructions, where diff --git a/Emscripten-build-instructions.md b/Emscripten-build-instructions.md index 665cc7155..b531fcacf 100644 --- a/Emscripten-build-instructions.md +++ b/Emscripten-build-instructions.md @@ -65,7 +65,6 @@ cd .\llvm-project\ cp -r ..\patches\llvm\emscripten-clang21* git apply -v emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch git apply -v emscripten-clang21-2-enable_exception_handling.patch -git apply -v emscripten-clang21-3-llvm-abi-annotation-remote.patch ``` We are now in a position to build an emscripten build of llvm by executing the following on Linux diff --git a/docs/Emscripten-build-instructions.rst b/docs/Emscripten-build-instructions.rst index 77a1cd105..305a4b33a 100644 --- a/docs/Emscripten-build-instructions.rst +++ b/docs/Emscripten-build-instructions.rst @@ -84,7 +84,6 @@ On Windows execute the following cp -r ..\patches\llvm\emscripten-clang21* git apply -v emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch git apply -v emscripten-clang21-2-enable_exception_handling.patch - git apply -v emscripten-clang21-3-llvm-abi-annotation-remote.patch We are now in a position to build an emscripten build of llvm by executing the following on Linux and osx @@ -430,4 +429,4 @@ and on Windows execute --contents xeus-cpp/notebooks/images/marie.png ` --contents xeus-cpp/notebooks/audio/audio.wav ` --XeusAddon.mounts="$env:PREFIX/share/xeus-cpp/tagfiles:/share/xeus-cpp/tagfiles" ` - --XeusAddon.mounts="$env:PREFIX/etc/xeus-cpp/tags.d:/etc/xeus-cpp/tags.d" + --XeusAddon.mounts="$env:PREFIX/etc/xeus-cpp/tags.d:/etc/xeus-cpp/tags.d" \ No newline at end of file diff --git a/patches/llvm/emscripten-clang21-3-llvm-abi-annotation-remote.patch b/patches/llvm/emscripten-clang21-3-llvm-abi-annotation-remote.patch deleted file mode 100644 index 3c9621745..000000000 --- a/patches/llvm/emscripten-clang21-3-llvm-abi-annotation-remote.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/llvm/include/llvm/Support/Compiler.h b/llvm/include/llvm/Support/Compiler.h -index 297d3e9b0..6aaa5d4e3 100644 ---- a/llvm/include/llvm/Support/Compiler.h -+++ b/llvm/include/llvm/Support/Compiler.h -@@ -202,10 +202,10 @@ - #define LLVM_EXPORT_TEMPLATE - #define LLVM_ABI_EXPORT LLVM_ABI - #elif defined(__MACH__) || defined(__WASM__) || defined(__EMSCRIPTEN__) --#define LLVM_ABI __attribute__((visibility("default"))) -+#define LLVM_ABI - #define LLVM_TEMPLATE_ABI - #define LLVM_EXPORT_TEMPLATE --#define LLVM_ABI_EXPORT LLVM_ABI -+#define LLVM_ABI_EXPORT - #endif - #endif - #endif From a4dc596a866f199bd0660972e03a2268cd915d9a Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 5 Nov 2025 08:43:05 +0000 Subject: [PATCH 23/27] Remove Windows llvm 20 jobs --- .github/workflows/main.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 98119b7db..226cce412 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -226,13 +226,6 @@ jobs: cling: Off llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" - - name: win11-msvc-clang-repl-20 - os: windows-11-arm - compiler: msvc - clang-runtime: '20' - cling: Off - llvm_enable_projects: "clang" - llvm_targets_to_build: "host;NVPTX" - name: win11-msvc-clang18-cling os: windows-11-arm compiler: msvc @@ -249,13 +242,6 @@ jobs: cling: Off llvm_enable_projects: "clang" llvm_targets_to_build: "host;NVPTX" - - name: win2025-msvc-clang-repl-20 - os: windows-2025 - compiler: msvc - clang-runtime: '20' - cling: Off - llvm_enable_projects: "clang" - llvm_targets_to_build: "host;NVPTX" - name: win2025-msvc-clang18-cling os: windows-2025 compiler: msvc @@ -358,3 +344,4 @@ jobs: # When debugging increase to a suitable value! timeout-minutes: 30 + From 63249d772b5d1717fb0b9b4682cb10e21b6a3a7d Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 12 Nov 2025 12:03:07 +0000 Subject: [PATCH 24/27] Update emscripten.yml --- .github/workflows/emscripten.yml | 39 +++++++++++++------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index 36694d7c6..8f8852dee 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -1010,6 +1010,7 @@ jobs: if: ${{ runner.os != 'windows' }} shell: bash -l {0} run: | + set -e ./emsdk/emsdk activate ${{matrix.emsdk_ver}} source ./emsdk/emsdk_env.sh micromamba activate CppInterOp-wasm @@ -1028,12 +1029,25 @@ jobs: -DXEUS_CPP_RESOURCE_DIR=${{ env.LLVM_BUILD_DIR }}/lib/clang/${{ matrix.clang-runtime }} \ -DSYSROOT_PATH=${{ env.SYSROOT_PATH }} \ .. + emmake make -j ${{ env.ncpus }} check-xeus-cpp emmake make -j ${{ env.ncpus }} install - name: Build xeus-cpp on Windows systems if: ${{ runner.os == 'windows' }} shell: powershell run: | + function Error-OnFailure { + param ( + [Parameter(Mandatory)] + [ScriptBlock]$Command + ) + + & $Command + + if ($LASTEXITCODE -ne 0) { + exit $LASTEXITCODE + } + } .\emsdk\emsdk activate ${{matrix.emsdk_ver}} .\emsdk\emsdk_env.ps1 micromamba activate CppInterOp-wasm @@ -1052,36 +1066,15 @@ jobs: -DXEUS_CPP_RESOURCE_DIR=${{ env.LLVM_BUILD_DIR }}\lib\clang\${{ matrix.clang-runtime }} ` -DSYSROOT_PATH=${{ env.SYSROOT_PATH }} ` .. - emmake make -j ${{ env.ncpus }} install - - - name: Test xeus-cpp C++ Emscripten on Unix Systems - if: ${{ runner.os != 'windows' }} - shell: bash -l {0} - run: | - set -e - micromamba activate CppInterOp-wasm - cd ./xeus-cpp/build/test - node test_xeus_cpp.js + Error-OnFailure { emmake make -j ${{ env.ncpus }} check-xeus-cpp } + Error-OnFailure { emmake make -j ${{ env.ncpus }} install } - name: Test xeus-cpp C++ Emscripten on Windows Systems if: ${{ runner.os == 'windows' }} shell: powershell run: | - function Error-OnFailure { - param ( - [Parameter(Mandatory)] - [ScriptBlock]$Command - ) - - & $Command - - if ($LASTEXITCODE -ne 0) { - exit $LASTEXITCODE - } - } micromamba activate CppInterOp-wasm cd .\xeus-cpp\build\test - node test_xeus_cpp.js echo "Running test_xeus_cpp in Firefox" Error-OnFailure { emrun.bat --browser="firefox.exe" --kill_exit --timeout 60 --browser-args="--headless" test_xeus_cpp.html } echo "Running test_xeus_cpp in Chromium" From 31a95be7e7d9e337581c7927261a3c422e36a3e0 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Thu, 4 Dec 2025 21:45:14 +0000 Subject: [PATCH 25/27] Update main.yml --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5cf1aabbd..66cdedf68 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -94,7 +94,7 @@ jobs: oop-jit: On coverage: true Valgrind: On - - name: ubu24-x86-gcc12-clang-repl-20-out-of-process-coverage + - name: ubu24-x86-gcc12-clang-repl-20-out-of-process-coverage os: ubuntu-24.04 compiler: gcc-12 clang-runtime: '20' @@ -347,3 +347,4 @@ jobs: uses: mxschmitt/action-tmate@v3 # When debugging increase to a suitable value! timeout-minutes: 30 + From 3161cada5098d0d97d0dbf277ea1bbd40d63aefb Mon Sep 17 00:00:00 2001 From: mcbarton Date: Fri, 5 Dec 2025 08:39:24 +0000 Subject: [PATCH 26/27] Revert some changes to emscripten.yml --- .github/workflows/emscripten.yml | 39 +++++++++++++++++++------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index dd570e12e..83d0c9ac5 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -1010,7 +1010,6 @@ jobs: if: ${{ runner.os != 'windows' }} shell: bash -l {0} run: | - set -e ./emsdk/emsdk activate ${{matrix.emsdk_ver}} source ./emsdk/emsdk_env.sh micromamba activate CppInterOp-wasm @@ -1029,25 +1028,12 @@ jobs: -DXEUS_CPP_RESOURCE_DIR=${{ env.LLVM_BUILD_DIR }}/lib/clang/${{ matrix.clang-runtime }} \ -DSYSROOT_PATH=${{ env.SYSROOT_PATH }} \ .. - emmake make -j ${{ env.ncpus }} check-xeus-cpp emmake make -j ${{ env.ncpus }} install - name: Build xeus-cpp on Windows systems if: ${{ runner.os == 'windows' }} shell: powershell run: | - function Error-OnFailure { - param ( - [Parameter(Mandatory)] - [ScriptBlock]$Command - ) - - & $Command - - if ($LASTEXITCODE -ne 0) { - exit $LASTEXITCODE - } - } .\emsdk\emsdk activate ${{matrix.emsdk_ver}} .\emsdk\emsdk_env.ps1 micromamba activate CppInterOp-wasm @@ -1066,15 +1052,36 @@ jobs: -DXEUS_CPP_RESOURCE_DIR=${{ env.LLVM_BUILD_DIR }}\lib\clang\${{ matrix.clang-runtime }} ` -DSYSROOT_PATH=${{ env.SYSROOT_PATH }} ` .. - Error-OnFailure { emmake make -j ${{ env.ncpus }} check-xeus-cpp } - Error-OnFailure { emmake make -j ${{ env.ncpus }} install } + emmake make -j ${{ env.ncpus }} install + + - name: Test xeus-cpp C++ Emscripten on Unix Systems + if: ${{ runner.os != 'windows' }} + shell: bash -l {0} + run: | + set -e + micromamba activate CppInterOp-wasm + cd ./xeus-cpp/build/test + node test_xeus_cpp.js - name: Test xeus-cpp C++ Emscripten on Windows Systems if: ${{ runner.os == 'windows' }} shell: powershell run: | + function Error-OnFailure { + param ( + [Parameter(Mandatory)] + [ScriptBlock]$Command + ) + + & $Command + + if ($LASTEXITCODE -ne 0) { + exit $LASTEXITCODE + } + } micromamba activate CppInterOp-wasm cd .\xeus-cpp\build\test + node test_xeus_cpp.js echo "Running test_xeus_cpp in Firefox" Error-OnFailure { emrun.bat --browser="firefox.exe" --kill_exit --timeout 60 --browser-args="--headless" test_xeus_cpp.html } echo "Running test_xeus_cpp in Chromium" From f1dcde1e07ae363850dbf473064bce1a0ba03c97 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Fri, 19 Dec 2025 14:06:50 +0000 Subject: [PATCH 27/27] Fix MacOS jobs with llvm 21 patch --- .github/actions/Build_LLVM/action.yml | 4 + README.md | 6 + docs/DevelopersDocumentation.rst | 6 + docs/InstallationAndUsage.rst | 6 + ...1-1-add-back-darwin-legacy-framework.patch | 314 ++++++++++++++++++ 5 files changed, 336 insertions(+) create mode 100644 patches/llvm/clang-21-1-add-back-darwin-legacy-framework.patch diff --git a/.github/actions/Build_LLVM/action.yml b/.github/actions/Build_LLVM/action.yml index 10ecfd717..55196a22b 100644 --- a/.github/actions/Build_LLVM/action.yml +++ b/.github/actions/Build_LLVM/action.yml @@ -48,6 +48,10 @@ runs: git apply -v ../patches/llvm/clang20-1-out-of-process.patch echo "Apply clang20-1-out-of-process.patch:" fi + if [[ "${llvm_vers}" == "21" && "${{ matrix.os }}" == macos* ]]; then + git apply -v ../patches/llvm/clang-21-1-add-back-darwin-legacy-framework.patch + echo "Applying clang-21-1-add-back-darwin-legacy-framework.patch" + fi cd build cmake -DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects}}" \ -DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" \ diff --git a/README.md b/README.md index 19133a965..cce6bd312 100644 --- a/README.md +++ b/README.md @@ -118,6 +118,12 @@ If you want to have out-of-process JIT execution enabled in CppInterOp, then app git apply -v ../CppInterOp/patches/llvm/clang20-1-out-of-process.patch ``` +MacOS builds also require the following patch be applied regardless of building the out of process JIT or not + +```bash +git apply -v ../CppInterOp/patches/llvm/clang-21-1-add-back-darwin-legacy-framework.patch +``` + ##### Build Clang-REPL Clang-REPL is an interpreter that CppInterOp works alongside. Build Clang (and diff --git a/docs/DevelopersDocumentation.rst b/docs/DevelopersDocumentation.rst index 77e89238a..be1e62c39 100644 --- a/docs/DevelopersDocumentation.rst +++ b/docs/DevelopersDocumentation.rst @@ -50,6 +50,12 @@ If you want to have out-of-process JIT execution enabled in CppInterOp, then app git apply -v ../CppInterOp/patches/llvm/clang20-1-out-of-process.patch +MacOS builds also require the following patch be applied regardless of building the out of process JIT or not + +.. code:: bash + + git apply -v ../CppInterOp/patches/llvm/clang-21-1-add-back-darwin-legacy-framework.patch + ****************** Build Clang-REPL ****************** diff --git a/docs/InstallationAndUsage.rst b/docs/InstallationAndUsage.rst index 911281c25..c1f2c33a7 100644 --- a/docs/InstallationAndUsage.rst +++ b/docs/InstallationAndUsage.rst @@ -50,6 +50,12 @@ If you want to have out-of-process JIT execution enabled in CppInterOp, then app git apply -v ../CppInterOp/patches/llvm/clang20-1-out-of-process.patch +MacOS builds also require the following patch be applied regardless of building the out of process JIT or not + +.. code:: bash + + git apply -v ../CppInterOp/patches/llvm/clang-21-1-add-back-darwin-legacy-framework.patch + ****************** Build Clang-REPL ****************** diff --git a/patches/llvm/clang-21-1-add-back-darwin-legacy-framework.patch b/patches/llvm/clang-21-1-add-back-darwin-legacy-framework.patch new file mode 100644 index 000000000..d1f79365c --- /dev/null +++ b/patches/llvm/clang-21-1-add-back-darwin-legacy-framework.patch @@ -0,0 +1,314 @@ +diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td +index 958d0d05a..99a525e1b 100644 +--- a/clang/include/clang/Driver/Options.td ++++ b/clang/include/clang/Driver/Options.td +@@ -8588,11 +8588,6 @@ def objc_isystem : Separate<["-"], "objc-isystem">, + def objcxx_isystem : Separate<["-"], "objcxx-isystem">, + MetaVarName<"">, + HelpText<"Add directory to the ObjC++ SYSTEM include search path">; +-def internal_iframework : Separate<["-"], "internal-iframework">, +- MetaVarName<"">, +- HelpText<"Add directory to the internal system framework search path; these " +- "are assumed to not be user-provided and are used to model system " +- "and standard frameworks' paths.">; + def internal_isystem : Separate<["-"], "internal-isystem">, + MetaVarName<"">, + HelpText<"Add directory to the internal system include search path; these " +diff --git a/clang/include/clang/Driver/ToolChain.h b/clang/include/clang/Driver/ToolChain.h +index b8899e781..5fe9a5dcb 100644 +--- a/clang/include/clang/Driver/ToolChain.h ++++ b/clang/include/clang/Driver/ToolChain.h +@@ -225,9 +225,6 @@ protected: + + /// \name Utilities for implementing subclasses. + ///@{ +- static void addSystemFrameworkInclude(const llvm::opt::ArgList &DriverArgs, +- llvm::opt::ArgStringList &CC1Args, +- const Twine &Path); + static void addSystemInclude(const llvm::opt::ArgList &DriverArgs, + llvm::opt::ArgStringList &CC1Args, + const Twine &Path); +@@ -238,9 +235,6 @@ protected: + addExternCSystemIncludeIfExists(const llvm::opt::ArgList &DriverArgs, + llvm::opt::ArgStringList &CC1Args, + const Twine &Path); +- static void addSystemFrameworkIncludes(const llvm::opt::ArgList &DriverArgs, +- llvm::opt::ArgStringList &CC1Args, +- ArrayRef Paths); + static void addSystemIncludes(const llvm::opt::ArgList &DriverArgs, + llvm::opt::ArgStringList &CC1Args, + ArrayRef Paths); +diff --git a/clang/lib/Driver/Job.cpp b/clang/lib/Driver/Job.cpp +index 880e9e396..9573e5444 100644 +--- a/clang/lib/Driver/Job.cpp ++++ b/clang/lib/Driver/Job.cpp +@@ -67,15 +67,14 @@ static bool skipArgs(const char *Flag, bool HaveCrashVFS, int &SkipNum, + return true; + + // Some include flags shouldn't be skipped if we have a crash VFS +- IsInclude = +- llvm::StringSwitch(Flag) +- .Cases("-include", "-header-include-file", true) +- .Cases("-idirafter", "-internal-isystem", "-iwithprefix", true) +- .Cases("-internal-externc-isystem", "-iprefix", true) +- .Cases("-iwithprefixbefore", "-isystem", "-iquote", true) +- .Cases("-isysroot", "-I", "-F", "-resource-dir", true) +- .Cases("-internal-iframework", "-iframework", "-include-pch", true) +- .Default(false); ++ IsInclude = llvm::StringSwitch(Flag) ++ .Cases("-include", "-header-include-file", true) ++ .Cases("-idirafter", "-internal-isystem", "-iwithprefix", true) ++ .Cases("-internal-externc-isystem", "-iprefix", true) ++ .Cases("-iwithprefixbefore", "-isystem", "-iquote", true) ++ .Cases("-isysroot", "-I", "-F", "-resource-dir", true) ++ .Cases("-iframework", "-include-pch", true) ++ .Default(false); + if (IsInclude) + return !HaveCrashVFS; + +diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp +index 07a3ae925..f1f6c3df8 100644 +--- a/clang/lib/Driver/ToolChain.cpp ++++ b/clang/lib/Driver/ToolChain.cpp +@@ -1383,17 +1383,10 @@ ToolChain::CXXStdlibType ToolChain::GetCXXStdlibType(const ArgList &Args) const{ + return *cxxStdlibType; + } + +-/// Utility function to add a system framework directory to CC1 arguments. +-void ToolChain::addSystemFrameworkInclude(const llvm::opt::ArgList &DriverArgs, +- llvm::opt::ArgStringList &CC1Args, +- const Twine &Path) { +- CC1Args.push_back("-internal-iframework"); +- CC1Args.push_back(DriverArgs.MakeArgString(Path)); +-} +- + /// Utility function to add a system include directory to CC1 arguments. +-void ToolChain::addSystemInclude(const ArgList &DriverArgs, +- ArgStringList &CC1Args, const Twine &Path) { ++/*static*/ void ToolChain::addSystemInclude(const ArgList &DriverArgs, ++ ArgStringList &CC1Args, ++ const Twine &Path) { + CC1Args.push_back("-internal-isystem"); + CC1Args.push_back(DriverArgs.MakeArgString(Path)); + } +@@ -1406,9 +1399,9 @@ void ToolChain::addSystemInclude(const ArgList &DriverArgs, + /// "C" semantics. These semantics are *ignored* by and large today, but its + /// important to preserve the preprocessor changes resulting from the + /// classification. +-void ToolChain::addExternCSystemInclude(const ArgList &DriverArgs, +- ArgStringList &CC1Args, +- const Twine &Path) { ++/*static*/ void ToolChain::addExternCSystemInclude(const ArgList &DriverArgs, ++ ArgStringList &CC1Args, ++ const Twine &Path) { + CC1Args.push_back("-internal-externc-isystem"); + CC1Args.push_back(DriverArgs.MakeArgString(Path)); + } +@@ -1420,28 +1413,19 @@ void ToolChain::addExternCSystemIncludeIfExists(const ArgList &DriverArgs, + addExternCSystemInclude(DriverArgs, CC1Args, Path); + } + +-/// Utility function to add a list of system framework directories to CC1. +-void ToolChain::addSystemFrameworkIncludes(const ArgList &DriverArgs, +- ArgStringList &CC1Args, +- ArrayRef Paths) { +- for (const auto &Path : Paths) { +- CC1Args.push_back("-internal-iframework"); +- CC1Args.push_back(DriverArgs.MakeArgString(Path)); +- } +-} +- + /// Utility function to add a list of system include directories to CC1. +-void ToolChain::addSystemIncludes(const ArgList &DriverArgs, +- ArgStringList &CC1Args, +- ArrayRef Paths) { ++/*static*/ void ToolChain::addSystemIncludes(const ArgList &DriverArgs, ++ ArgStringList &CC1Args, ++ ArrayRef Paths) { + for (const auto &Path : Paths) { + CC1Args.push_back("-internal-isystem"); + CC1Args.push_back(DriverArgs.MakeArgString(Path)); + } + } + +-std::string ToolChain::concat(StringRef Path, const Twine &A, const Twine &B, +- const Twine &C, const Twine &D) { ++/*static*/ std::string ToolChain::concat(StringRef Path, const Twine &A, ++ const Twine &B, const Twine &C, ++ const Twine &D) { + SmallString<128> Result(Path); + llvm::sys::path::append(Result, llvm::sys::path::Style::posix, A, B, C, D); + return std::string(Result); +diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp +index 234683f2f..8d469f7d1 100644 +--- a/clang/lib/Driver/ToolChains/Darwin.cpp ++++ b/clang/lib/Driver/ToolChains/Darwin.cpp +@@ -2676,26 +2676,6 @@ void AppleMachO::AddClangSystemIncludeArgs( + } + } + +-void DarwinClang::AddClangSystemIncludeArgs( +- const llvm::opt::ArgList &DriverArgs, +- llvm::opt::ArgStringList &CC1Args) const { +- AppleMachO::AddClangSystemIncludeArgs(DriverArgs, CC1Args); +- +- if (DriverArgs.hasArg(options::OPT_nostdinc, options::OPT_nostdlibinc)) +- return; +- +- llvm::SmallString<128> Sysroot = GetEffectiveSysroot(DriverArgs); +- +- // Add /System/Library/Frameworks +- // Add /System/Library/SubFrameworks +- // Add /Library/Frameworks +- SmallString<128> P1(Sysroot), P2(Sysroot), P3(Sysroot); +- llvm::sys::path::append(P1, "System", "Library", "Frameworks"); +- llvm::sys::path::append(P2, "System", "Library", "SubFrameworks"); +- llvm::sys::path::append(P3, "Library", "Frameworks"); +- addSystemFrameworkIncludes(DriverArgs, CC1Args, {P1, P2, P3}); +-} +- + bool DarwinClang::AddGnuCPlusPlusIncludePaths(const llvm::opt::ArgList &DriverArgs, + llvm::opt::ArgStringList &CC1Args, + llvm::SmallString<128> Base, +diff --git a/clang/lib/Driver/ToolChains/Darwin.h b/clang/lib/Driver/ToolChains/Darwin.h +index b38bfe6d1..76523d636 100644 +--- a/clang/lib/Driver/ToolChains/Darwin.h ++++ b/clang/lib/Driver/ToolChains/Darwin.h +@@ -647,10 +647,6 @@ public: + /// @name Apple ToolChain Implementation + /// { + +- void +- AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, +- llvm::opt::ArgStringList &CC1Args) const override; +- + RuntimeLibType GetRuntimeLibType(const llvm::opt::ArgList &Args) const override; + + void AddLinkRuntimeLibArgs(const llvm::opt::ArgList &Args, +diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp +index 08f3b7a7f..3744346e8 100644 +--- a/clang/lib/Frontend/CompilerInvocation.cpp ++++ b/clang/lib/Frontend/CompilerInvocation.cpp +@@ -3405,8 +3405,6 @@ static void GenerateHeaderSearchArgs(const HeaderSearchOptions &Opts, + : OPT_internal_externc_isystem; + GenerateArg(Consumer, Opt, It->Path); + } +- for (; It < End && Matches(*It, {frontend::System}, true, true); ++It) +- GenerateArg(Consumer, OPT_internal_iframework, It->Path); + + assert(It == End && "Unhandled HeaderSearchOption::Entry."); + +@@ -3539,8 +3537,6 @@ static bool ParseHeaderSearchArgs(HeaderSearchOptions &Opts, ArgList &Args, + Group = frontend::ExternCSystem; + Opts.AddPath(A->getValue(), Group, false, true); + } +- for (const auto *A : Args.filtered(OPT_internal_iframework)) +- Opts.AddPath(A->getValue(), frontend::System, true, true); + + // Add the path prefixes which are implicitly treated as being system headers. + for (const auto *A : +diff --git a/clang/lib/Lex/InitHeaderSearch.cpp b/clang/lib/Lex/InitHeaderSearch.cpp +index 3e22b4001..bfe3da86b 100644 +--- a/clang/lib/Lex/InitHeaderSearch.cpp ++++ b/clang/lib/Lex/InitHeaderSearch.cpp +@@ -244,9 +244,6 @@ bool InitHeaderSearch::ShouldAddDefaultIncludePaths( + break; + } + +- if (triple.isOSDarwin()) +- return false; +- + return true; // Everything else uses AddDefaultIncludePaths(). + } + +@@ -261,6 +258,22 @@ void InitHeaderSearch::AddDefaultIncludePaths( + if (!ShouldAddDefaultIncludePaths(triple)) + return; + ++ // NOTE: some additional header search logic is handled in the driver for ++ // Darwin. ++ if (triple.isOSDarwin()) { ++ if (HSOpts.UseStandardSystemIncludes) { ++ // Add the default framework include paths on Darwin. ++ if (triple.isDriverKit()) { ++ AddPath("/System/DriverKit/System/Library/Frameworks", System, true); ++ } else { ++ AddPath("/System/Library/Frameworks", System, true); ++ AddPath("/System/Library/SubFrameworks", System, true); ++ AddPath("/Library/Frameworks", System, true); ++ } ++ } ++ return; ++ } ++ + if (Lang.CPlusPlus && !Lang.AsmPreprocessor && + HSOpts.UseStandardCXXIncludes && HSOpts.UseStandardSystemIncludes) { + if (HSOpts.UseLibcxx) { +diff --git a/clang/test/Driver/Inputs/DriverKit19.0.sdk/System/DriverKit/System/Library/SubFrameworks/.keep b/clang/test/Driver/Inputs/DriverKit19.0.sdk/System/DriverKit/System/Library/SubFrameworks/.keep +deleted file mode 100644 +index e69de29bb..000000000 +diff --git a/clang/test/Driver/Inputs/MacOSX15.1.sdk/Library/Frameworks/.keep b/clang/test/Driver/Inputs/MacOSX15.1.sdk/Library/Frameworks/.keep +deleted file mode 100644 +index e69de29bb..000000000 +diff --git a/clang/test/Driver/Inputs/MacOSX15.1.sdk/System/Library/Frameworks/.keep b/clang/test/Driver/Inputs/MacOSX15.1.sdk/System/Library/Frameworks/.keep +deleted file mode 100644 +index e69de29bb..000000000 +diff --git a/clang/test/Driver/Inputs/MacOSX15.1.sdk/System/Library/SubFrameworks/.keep b/clang/test/Driver/Inputs/MacOSX15.1.sdk/System/Library/SubFrameworks/.keep +deleted file mode 100644 +index e69de29bb..000000000 +diff --git a/clang/test/Driver/darwin-framework-search-paths.c b/clang/test/Driver/darwin-framework-search-paths.c +deleted file mode 100644 +index 1cb4dc420..000000000 +--- a/clang/test/Driver/darwin-framework-search-paths.c ++++ /dev/null +@@ -1,23 +0,0 @@ +-// UNSUPPORTED: system-windows +-// Windows is unsupported because we use the Unix path separator `/` in the test. +- +-// RUN: %clang %s -target arm64-apple-macosx15.1 -isysroot %S/Inputs/MacOSX15.1.sdk -c %s -### 2>&1 \ +-// RUN: | FileCheck -DSDKROOT=%S/Inputs/MacOSX15.1.sdk %s +-// +-// CHECK: "-cc1" +-// CHECK: "-resource-dir" "[[RESOURCE_DIR:[^"]*]]" +-// CHECK-SAME: "-internal-iframework" "[[SDKROOT]]/System/Library/Frameworks" +-// CHECK-SAME: "-internal-iframework" "[[SDKROOT]]/System/Library/SubFrameworks" +-// CHECK-SAME: "-internal-iframework" "[[SDKROOT]]/Library/Frameworks" +- +-// Verify that -nostdlibinc and -nostdinc removes the default search paths. +-// +-// RUN: %clang %s -target arm64-apple-macosx15.1 -isysroot %S/Inputs/MacOSX15.1.sdk -nostdinc -c %s -### 2>&1 \ +-// RUN: | FileCheck --check-prefix=CHECK-NOSTD -DSDKROOT=%S/Inputs/MacOSX15.1.sdk %s +-// +-// RUN: %clang %s -target arm64-apple-macosx15.1 -isysroot %S/Inputs/MacOSX15.1.sdk -nostdlibinc -c %s -### 2>&1 \ +-// RUN: | FileCheck --check-prefix=CHECK-NOSTD -DSDKROOT=%S/Inputs/MacOSX15.1.sdk %s +-// +-// CHECK-NOSTD: "-cc1" +-// CHECK-NOSTD: "-resource-dir" "[[RESOURCE_DIR:[^"]*]]" +-// CHECK-NOSTD-NOT: "-internal-iframework" +diff --git a/clang/test/Driver/driverkit-path.c b/clang/test/Driver/driverkit-path.c +index 32f0a6721..3caae382d 100644 +--- a/clang/test/Driver/driverkit-path.c ++++ b/clang/test/Driver/driverkit-path.c +@@ -21,15 +21,13 @@ int main() { return 0; } + // LD64-NEW: "-isysroot" "[[PATH:[^"]*]]Inputs/DriverKit19.0.sdk" + // LD64-NEW-NOT: "-L[[PATH]]Inputs/DriverKit19.0.sdk/System/DriverKit/usr/lib" + // LD64-NEW-NOT: "-F[[PATH]]Inputs/DriverKit19.0.sdk/System/DriverKit/System/Library/Frameworks" +-// LD64-NEW-NOT: "-F[[PATH]]Inputs/DriverKit19.0.sdk/System/DriverKit/System/Library/SubFrameworks" + + +-// RUN: %clang %s -target x86_64-apple-driverkit19.0 -isysroot %S/Inputs/DriverKit19.0.sdk -x c++ -### 2>&1 \ +-// RUN: | FileCheck %s -DSDKROOT=%S/Inputs/DriverKit19.0.sdk --check-prefix=INC ++// RUN: %clang %s -target x86_64-apple-driverkit19.0 -isysroot %S/Inputs/DriverKit19.0.sdk -E -v -x c++ 2>&1 | FileCheck %s --check-prefix=INC + // +-// INC: "-isysroot" "[[SDKROOT]]" +-// INC: "-internal-isystem" "[[SDKROOT]]/System/DriverKit/usr/local/include" +-// INC: "-internal-isystem" "{{.+}}/lib{{(64)?}}/clang/{{[^/ ]+}}/include" +-// INC: "-internal-externc-isystem" "[[SDKROOT]]/System/DriverKit/usr/include" +-// INC: "-internal-iframework" "[[SDKROOT]]/System/DriverKit/System/Library/Frameworks" +-// INC: "-internal-iframework" "[[SDKROOT]]/System/DriverKit/System/Library/SubFrameworks" ++// INC: -isysroot [[PATH:[^ ]*/Inputs/DriverKit19.0.sdk]] ++// INC-LABEL: #include <...> search starts here: ++// INC: [[PATH]]/System/DriverKit/usr/local/include ++// INC: /lib{{(64)?}}/clang/{{[^/ ]+}}/include ++// INC: [[PATH]]/System/DriverKit/usr/include ++// INC: [[PATH]]/System/DriverKit/System/Library/Frameworks (framework directory)