Merge branch 'main' into Update-to-llvm-20

Author: mcbarton

.github/workflows/clang-tidy-review-post.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: Post review comments
         id: post-review
-        uses: ZedThree/clang-tidy-review/post@v0.20.1
+        uses: ZedThree/clang-tidy-review/post@v0.21.0
         with:
           max_comments: 10
 

.github/workflows/clang-tidy-review.yml

@@ -31,7 +31,7 @@ jobs:
         run: pip install lit
 
       - name: Run clang-tidy
-        uses: ZedThree/clang-tidy-review@v0.20.1
+        uses: ZedThree/clang-tidy-review@v0.21.0
         id: review
         with:
           build_dir: build
@@ -47,4 +47,4 @@ jobs:
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 
       - name: Upload artifacts
-        uses: ZedThree/clang-tidy-review/upload@v0.20.1
+        uses: ZedThree/clang-tidy-review/upload@v0.21.0

.github/workflows/stale-pr-and-issues.yml

@@ -31,7 +31,7 @@ ExternalProject_Add(
   googletest
   GIT_REPOSITORY https://github.com/google/googletest.git
   GIT_SHALLOW 1
-  GIT_TAG v1.15.2
+  GIT_TAG v1.16.0
   UPDATE_COMMAND ""
   # # Force separate output paths for debug and release builds to allow easy
   # # identification of correct lib in subsequent TARGET_LINK_LIBRARIES commands

cmake/modules/GoogleTest.cmake

@@ -3,9 +3,9 @@ channels:
   - https://repo.prefix.dev/emscripten-forge-dev
 dependencies:
   - emscripten-abi==3.1.73
-  - nlohmann_json
+  - nlohmann_json=3.11.3
   - xeus-lite
   - xeus
   - cpp-argparse
   - pugixml
-  - doctest
+  - doctest

environment-wasm.yml

@@ -167,7 +167,7 @@ class Interpreter {
     return inner->getCompilerInstance();
   }
 
-  const llvm::orc::LLJIT* getExecutionEngine() const {
+  llvm::orc::LLJIT* getExecutionEngine() const {
     return compat::getExecutionEngine(*inner);
   }
 

lib/Interpreter/CppInterOpInterpreter.h

@@ -1766,6 +1766,66 @@ TEST(FunctionReflectionTest, Construct) {
   clang_Interpreter_dispose(I);
 }
 
+// Test nested constructor calls
+TEST(FunctionReflectionTest, ConstructNested) {
+#ifdef EMSCRIPTEN
+  GTEST_SKIP() << "Test fails for Emscipten builds";
+#endif
+  if (llvm::sys::RunningOnValgrind())
+    GTEST_SKIP() << "XFAIL due to Valgrind report";
+#ifdef _WIN32
+  GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
+#endif
+
+  Cpp::CreateInterpreter();
+
+  Interp->declare(R"(
+    #include <new>
+    extern "C" int printf(const char*,...);
+    class A {
+    public:
+      int a_val;
+      A() : a_val(7) {
+        printf("A Constructor Called\n");
+      }
+    };
+
+    class B {
+    public:
+      A a;
+      int b_val;
+      B() : b_val(99) {
+        printf("B Constructor Called\n");
+      }
+    };
+    )");
+
+  testing::internal::CaptureStdout();
+  Cpp::TCppScope_t scope_A = Cpp::GetNamed("A");
+  Cpp::TCppScope_t scope_B = Cpp::GetNamed("B");
+  Cpp::TCppObject_t object = Cpp::Construct(scope_B);
+  EXPECT_TRUE(object != nullptr);
+  std::string output = testing::internal::GetCapturedStdout();
+  EXPECT_EQ(output, "A Constructor Called\nB Constructor Called\n");
+  output.clear();
+
+  // In-memory construction
+  testing::internal::CaptureStdout();
+  void* arena = Cpp::Allocate(scope_B);
+  EXPECT_TRUE(arena == Cpp::Construct(scope_B, arena));
+
+  // Check if both integers a_val and b_val were set.
+  EXPECT_EQ(*(int*)arena, 7);
+  size_t a_size = Cpp::SizeOf(scope_A);
+  int* b_val_ptr =
+      reinterpret_cast<int*>(reinterpret_cast<char*>(arena) + a_size);
+  EXPECT_EQ(*b_val_ptr, 99);
+  Cpp::Deallocate(scope_B, arena);
+  output = testing::internal::GetCapturedStdout();
+  EXPECT_EQ(output, "A Constructor Called\nB Constructor Called\n");
+  output.clear();
+}
+
 TEST(FunctionReflectionTest, Destruct) {
 #ifdef EMSCRIPTEN
   GTEST_SKIP() << "Test fails for Emscipten builds";