Merge branch 'main' into Add-Windows-Emscripten-build-of-xeus-cpp-to-ci

mcbarton · web-flow · commit 3d517876a325 · 2025-09-09T23:34:43.000+01:00
diff --git a/.codecov.yml b/.codecov.yml
@@ -4,7 +4,7 @@ codecov:
 coverage:
   precision: 2
   round: down
-  range: "70...100"
+  range: "75...100"
 
   status:
     project: yes
@@ -22,4 +22,7 @@ parsers:
 comment:
   layout: "reach, diff, flags, tree, files"
   behavior: default
-  require_changes: no
+  require_changes: no
+
+github_checks:
+  annotations: true # Deprecated but very useful
diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout PR branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
diff --git a/.github/workflows/clang-tidy-review.yml b/.github/workflows/clang-tidy-review.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout PR branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Python
         uses: actions/setup-python@v5
diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml
@@ -29,7 +29,7 @@ jobs:
             emsdk_ver: "3.1.73"
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
@@ -79,7 +79,7 @@ jobs:
             emsdk_ver: "3.1.73"
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
@@ -441,7 +441,7 @@ jobs:
             emsdk_ver: "3.1.73"
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -201,7 +201,7 @@ jobs:
             llvm_targets_to_build: "host;NVPTX"
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
diff --git a/.github/workflows/markdown-linter.yml b/.github/workflows/markdown-linter.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # super-linter needs the full git history to get the
           # list of files that changed across commits
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -274,10 +274,10 @@ endif()
   set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
 
   set( CPPINTEROP_BUILT_STANDALONE 1 )
-endif()
 
-include(AddLLVM)
-include(HandleLLVMOptions)
+  include(AddLLVM)
+  include(HandleLLVMOptions)
+endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
diff --git a/lib/CppInterOp/CMakeLists.txt b/lib/CppInterOp/CMakeLists.txt
@@ -69,6 +69,9 @@ endif()
             continue()
           endif()
           foreach(transitive_lib ${transitive_libs})
+            if(NOT TARGET ${transitive_lib})
+              continue()
+            endif()
             get_target_property(lib_type ${transitive_lib} TYPE)
             if("${lib_type}" STREQUAL "STATIC_LIBRARY")
               list(APPEND static_transitive_libs ${transitive_lib})
diff --git a/lib/CppInterOp/CXCppInterOp.cpp b/lib/CppInterOp/CXCppInterOp.cpp
@@ -437,7 +437,7 @@ CXString clang_getTypeAsString(CXQualType type) {
   clang::PrintingPolicy Policy = C.getPrintingPolicy();
   Policy.Bool = true;               // Print bool instead of _Bool.
   Policy.SuppressTagKeyword = true; // Do not print `class std::string`.
-  return makeCXString(compat::FixTypeName(QT.getAsString(Policy)));
+  return makeCXString(QT.getAsString(Policy));
 }
 
 CXQualType clang_getComplexType(CXQualType eltype) {
diff --git a/lib/CppInterOp/Compatibility.h b/lib/CppInterOp/Compatibility.h
@@ -393,18 +393,6 @@ class SynthesizingCodeRAII {
 
 namespace compat {
 
-// Clang >= 14 change type name to string (spaces formatting problem)
-inline std::string FixTypeName(const std::string type_name) {
-  return type_name;
-}
-
-inline std::string MakeResourceDir(llvm::StringRef Dir) {
-  llvm::SmallString<128> P(Dir);
-  llvm::sys::path::append(P, CLANG_INSTALL_LIBDIR_BASENAME, "clang",
-                          CLANG_VERSION_MAJOR_STRING);
-  return std::string(P.str());
-}
-
 // Clang >= 16 (=16 with Value patch) change castAs to convertTo
 #ifdef CPPINTEROP_USE_CLING
 template <typename T> inline T convertTo(cling::Value V) {
diff --git a/lib/CppInterOp/CppInterOp.cpp b/lib/CppInterOp/CppInterOp.cpp
@@ -11,6 +11,7 @@
 
 #include "Compatibility.h"
 
+#include "clang/AST/Attrs.inc"
 #include "clang/AST/CXXInheritance.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclAccessPair.h"
@@ -43,15 +44,19 @@
 #endif
 #include "clang/Sema/TemplateDeduction.h"
 
+#include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Demangle/Demangle.h"
 #include "llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h"
+#include "llvm/IR/GlobalValue.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
+#include "llvm/Support/Error.h"
 #include "llvm/Support/ManagedStatic.h"
-#include "llvm/Support/raw_os_ostream.h"
+#include "llvm/Support/Path.h"
+#include "llvm/Support/raw_ostream.h"
 
 #include <algorithm>
 #include <cassert>
@@ -64,6 +69,7 @@
 #include <sstream>
 #include <stack>
 #include <string>
+#include <utility>
 
 // Stream redirect.
 #ifdef _WIN32
@@ -134,6 +140,42 @@ static compat::Interpreter& getInterp() {
 static clang::Sema& getSema() { return getInterp().getCI()->getSema(); }
 static clang::ASTContext& getASTContext() { return getSema().getASTContext(); }
 
+static void ForceCodeGen(Decl* D, compat::Interpreter& I) {
+  // The decl was deferred by CodeGen. Force its emission.
+  // FIXME: In ASTContext::DeclMustBeEmitted we should check if the
+  // Decl::isUsed is set or we should be able to access CodeGen's
+  // addCompilerUsedGlobal.
+  ASTContext& C = I.getSema().getASTContext();
+
+  D->addAttr(UsedAttr::CreateImplicit(C));
+#ifdef CPPINTEROP_USE_CLING
+  cling::Interpreter::PushTransactionRAII RAII(&I);
+  I.getCI()->getASTConsumer().HandleTopLevelDecl(DeclGroupRef(D));
+#else // CLANG_REPL
+  I.getCI()->getASTConsumer().HandleTopLevelDecl(DeclGroupRef(D));
+  // Take the newest llvm::Module produced by CodeGen and send it to JIT.
+  auto GeneratedPTU = I.Parse("");
+  if (!GeneratedPTU)
+    llvm::logAllUnhandledErrors(GeneratedPTU.takeError(), llvm::errs(),
+                                "[ForceCodeGen] Failed to generate PTU:");
+
+  // From cling's BackendPasses.cpp
+  // FIXME: We need to upstream this code in IncrementalExecutor::addModule
+  for (auto& GV : GeneratedPTU->TheModule->globals()) {
+    llvm::GlobalValue::LinkageTypes LT = GV.getLinkage();
+    if (GV.isDeclaration() || !GV.hasName() ||
+        GV.getName().starts_with(".str") ||
+        !llvm::GlobalVariable::isDiscardableIfUnused(LT) ||
+        LT != llvm::GlobalValue::InternalLinkage)
+      continue; // nothing to do
+    GV.setLinkage(llvm::GlobalValue::WeakAnyLinkage);
+  }
+  if (auto Err = I.Execute(*GeneratedPTU))
+    llvm::logAllUnhandledErrors(std::move(Err), llvm::errs(),
+                                "[ForceCodeGen] Failed to execute PTU:");
+#endif
+}
+
 #define DEBUG_TYPE "jitcall"
 bool JitCall::AreArgumentsValid(void* result, ArgList args, void* self,
                                 size_t nary) const {
@@ -1333,8 +1375,16 @@ static TCppFuncAddr_t GetFunctionAddress(const FunctionDecl* FD) {
 
 TCppFuncAddr_t GetFunctionAddress(TCppFunction_t method) {
   auto* D = static_cast<Decl*>(method);
-  if (auto* FD = llvm::dyn_cast_or_null<FunctionDecl>(D))
+  if (auto* FD = llvm::dyn_cast_or_null<FunctionDecl>(D)) {
+    if ((IsTemplateInstantiationOrSpecialization(FD) ||
+         FD->getTemplatedKind() == FunctionDecl::TK_MemberSpecialization) &&
+        !FD->getDefinition())
+      InstantiateFunctionDefinition(D);
+    ASTContext& C = getASTContext();
+    if (isDiscardableGVALinkage(C.GetGVALinkageForFunction(FD)))
+      ForceCodeGen(FD, getInterp());
     return GetFunctionAddress(FD);
+  }
   return nullptr;
 }
 
@@ -1552,39 +1602,8 @@ intptr_t GetVariableOffset(compat::Interpreter& I, Decl* D,
     }
     if (!address) {
       auto Linkage = C.GetGVALinkageForVariable(VD);
-      // The decl was deferred by CodeGen. Force its emission.
-      // FIXME: In ASTContext::DeclMustBeEmitted we should check if the
-      // Decl::isUsed is set or we should be able to access CodeGen's
-      // addCompilerUsedGlobal.
       if (isDiscardableGVALinkage(Linkage))
-        VD->addAttr(UsedAttr::CreateImplicit(C));
-#ifdef CPPINTEROP_USE_CLING
-      cling::Interpreter::PushTransactionRAII RAII(&I);
-      I.getCI()->getASTConsumer().HandleTopLevelDecl(DeclGroupRef(VD));
-#else // CLANG_REPL
-      I.getCI()->getASTConsumer().HandleTopLevelDecl(DeclGroupRef(VD));
-      // Take the newest llvm::Module produced by CodeGen and send it to JIT.
-      auto GeneratedPTU = I.Parse("");
-      if (!GeneratedPTU)
-        llvm::logAllUnhandledErrors(
-            GeneratedPTU.takeError(), llvm::errs(),
-            "[GetVariableOffset] Failed to generate PTU:");
-
-      // From cling's BackendPasses.cpp
-      // FIXME: We need to upstream this code in IncrementalExecutor::addModule
-      for (auto& GV : GeneratedPTU->TheModule->globals()) {
-        llvm::GlobalValue::LinkageTypes LT = GV.getLinkage();
-        if (GV.isDeclaration() || !GV.hasName() ||
-            GV.getName().starts_with(".str") || !GV.isDiscardableIfUnused(LT) ||
-            LT != llvm::GlobalValue::InternalLinkage)
-          continue; // nothing to do
-        GV.setLinkage(llvm::GlobalValue::WeakAnyLinkage);
-      }
-      if (auto Err = I.Execute(*GeneratedPTU))
-        llvm::logAllUnhandledErrors(
-            std::move(Err), llvm::errs(),
-            "[GetVariableOffset] Failed to execute PTU:");
-#endif
+        ForceCodeGen(VD, I);
     }
     auto VDAorErr = compat::getSymbolAddress(I, StringRef(mangledName));
     if (!VDAorErr) {
@@ -1727,7 +1746,7 @@ std::string GetTypeAsString(TCppType_t var) {
   Policy.SuppressTagKeyword = true; // Do not print `class std::string`.
   Policy.SuppressElaboration = true;
   Policy.FullyQualifiedName = true;
-  return compat::FixTypeName(QT.getAsString(Policy));
+  return QT.getAsString(Policy);
 }
 
 TCppType_t GetCanonicalType(TCppType_t type) {
@@ -3168,7 +3187,10 @@ static std::string MakeResourcesPath() {
   Dir = sys::path::parent_path(Dir);
   // Dir = sys::path::parent_path(Dir);
 #endif // LLVM_BINARY_DIR
-  return compat::MakeResourceDir(Dir);
+  llvm::SmallString<128> P(Dir);
+  llvm::sys::path::append(P, CLANG_INSTALL_LIBDIR_BASENAME, "clang",
+                          CLANG_VERSION_MAJOR_STRING);
+  return std::string(P.str());
 }
 } // namespace
 
diff --git a/unittests/CppInterOp/FunctionReflectionTest.cpp b/unittests/CppInterOp/FunctionReflectionTest.cpp
@@ -1469,6 +1469,23 @@ TEST(FunctionReflectionTest, GetFunctionAddress) {
   EXPECT_EQ(address.str(), output);
 
   EXPECT_FALSE(Cpp::GetFunctionAddress(Cpp::GetGlobalScope()));
+
+  Interp->declare(R"(
+    template <typename T>
+    T add1(T t) { return t + 1; }
+  )");
+
+  std::vector<Cpp::TCppFunction_t> funcs;
+  Cpp::GetClassTemplatedMethods("add1", Cpp::GetGlobalScope(), funcs);
+  EXPECT_EQ(funcs.size(), 1);
+
+  ASTContext& C = Interp->getCI()->getASTContext();
+  std::vector<Cpp::TemplateArgInfo> argument = {C.DoubleTy.getAsOpaquePtr()};
+  Cpp::TCppScope_t add1_double =
+      Cpp::InstantiateTemplate(funcs[0], argument.data(), argument.size());
+  EXPECT_TRUE(add1_double);
+
+  EXPECT_TRUE(Cpp::GetFunctionAddress(add1_double));
 }
 
 TEST(FunctionReflectionTest, IsVirtualMethod) {
diff --git a/unittests/CppInterOp/InterpreterTest.cpp b/unittests/CppInterOp/InterpreterTest.cpp
@@ -334,7 +334,10 @@ if (llvm::sys::RunningOnValgrind())
 
 #ifdef CPPINTEROP_USE_CLING
     std::string MainExecutableName = sys::fs::getMainExecutable(nullptr, nullptr);
-    std::string ResourceDir = compat::MakeResourceDir(LLVM_BINARY_DIR);
+    llvm::SmallString<128> P(LLVM_BINARY_DIR);
+    llvm::sys::path::append(P, CLANG_INSTALL_LIBDIR_BASENAME, "clang",
+                            CLANG_VERSION_MAJOR_STRING);
+    std::string ResourceDir = std::string(P.str());
     std::vector<const char *> ClingArgv = {"-resource-dir", ResourceDir.c_str(),
                                            "-std=c++14"};
     ClingArgv.insert(ClingArgv.begin(), MainExecutableName.c_str());

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ CXString clang_getTypeAsString(CXQualType type) {`
`437`	`437`	`clang::PrintingPolicy Policy = C.getPrintingPolicy();`
`438`	`438`	`Policy.Bool = true; // Print bool instead of _Bool.`
`439`	`439`	Policy.SuppressTagKeyword = true; // Do not print `class std::string`.
`440`		`- return makeCXString(compat::FixTypeName(QT.getAsString(Policy)));`
	`440`	`+ return makeCXString(QT.getAsString(Policy));`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`CXQualType clang_getComplexType(CXQualType eltype) {`