Add first lot of compatibility changes with llvm 21

Author: mcbarton

.github/workflows/emscripten.yml

@@ -227,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
@@ -342,6 +342,11 @@ jobs:
             git apply -v Windows-emscripten-clang20-1-CrossCompile.patch
             git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.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 `

lib/CppInterOp/Compatibility.h

@@ -27,6 +27,16 @@ 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                                      \

lib/CppInterOp/CppInterOp.cpp

@@ -1107,16 +1107,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);

patches/llvm/Windows-emscripten-clang21-1-CrossCompile

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

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);