[interop] Bump to latest version, fixes cmake overriding testing flag

Author: aaronj0

Diff for: .github/workflows/cppinterop-diff.yml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: compiler-research/CppInterOp
-          ref: 6c6f94a22bd971520a249e2c02e4259cdd3a5be6
+          ref: b0c3e360bdbea9618dd2744836671667c108bf97
           path: CppInterOp
       - name: Drop directories that are not added to ROOT
         working-directory: CppInterOp

Diff for: interpreter/CppInterOp/CMakeLists.txt

@@ -59,6 +59,7 @@ set(CMAKE_CXX_EXTENSIONS NO)
 include(GNUInstallDirs)
   option(CPPINTEROP_USE_CLING "Use Cling as backend" OFF)
   option(CPPINTEROP_USE_REPL "Use clang-repl as backend" ON)
+  option(CPPINTEROP_ENABLE_TESTING "Enable the CppInterOp testing infrastructure." ON)
 
   if (CPPINTEROP_USE_CLING AND CPPINTEROP_USE_REPL)
     message(FATAL_ERROR "We can only use Cling (CPPINTEROP_USE_CLING=On) or Repl (CPPINTEROP_USE_REPL=On), but not both of them.")
@@ -453,10 +454,7 @@ option(CPPINTEROP_ENABLE_SPHINX "Use sphinx to generage CppInterOp user document
 
 if(EMSCRIPTEN)
     message("Build with emscripten")
-    option(CPPINTEROP_ENABLE_TESTING "Enables the testing infrastructure." OFF)
-else()
-    message("Build with cmake")
-    option(CPPINTEROP_ENABLE_TESTING "Enables the testing infrastructure." ON)
+    set(CPPINTEROP_ENABLE_TESTING OFF)
 endif()
 
 if(MSVC)

Diff for: interpreter/CppInterOp/lib/Interpreter/CppInterOp.cpp

@@ -1675,6 +1675,9 @@ namespace Cpp {
       //
       ASTContext& C = FD->getASTContext();
       PrintingPolicy Policy(C.getPrintingPolicy());
+#if CLANG_VERSION_MAJOR > 16
+      Policy.SuppressElaboration = true;
+#endif
       refType = kNotReference;
       if (QT->isRecordType() && forArgument) {
         get_type_as_string(QT, type_name, C, Policy);
@@ -1989,18 +1992,22 @@ namespace Cpp {
         EReferenceType refType = kNotReference;
         bool isPointer = false;
 
+        std::ostringstream typedefbuf;
+        std::ostringstream callbuf;
+
+        collect_type_info(FD, QT, typedefbuf, callbuf, type_name, refType,
+                          isPointer, indent_level, false);
+
+        buf << typedefbuf.str();
+
         buf << "if (ret) {\n";
         ++indent_level;
         {
-          std::ostringstream typedefbuf;
-          std::ostringstream callbuf;
           //
           //  Write the placement part of the placement new.
           //
           indent(callbuf, indent_level);
           callbuf << "new (ret) ";
-          collect_type_info(FD, QT, typedefbuf, callbuf, type_name, refType,
-                            isPointer, indent_level, false);
           //
           //  Write the type part of the placement new.
           //

Diff for: interpreter/CppInterOp/unittests/CppInterOp/FunctionReflectionTest.cpp

@@ -888,6 +888,9 @@ TEST(FunctionReflectionTest, GetFunctionCallWrapper) {
       int f3() { return 3; }
 
       extern "C" int f4() { return 4; }
+
+      typedef int(*int_func)(void);
+      int_func f5() { return f3; }
     }
   )");
 
@@ -923,6 +926,18 @@ TEST(FunctionReflectionTest, GetFunctionCallWrapper) {
   FCI4.Invoke(&ret4);
   EXPECT_EQ(ret4, 4);
 
+#if CLANG_VERSION_MAJOR > 16
+  Cpp::JitCall FCI5 =
+      Cpp::MakeFunctionCallable(Cpp::GetNamed("f5", Cpp::GetNamed("NS")));
+  EXPECT_TRUE(FCI5.getKind() == Cpp::JitCall::kGenericCall);
+
+  typedef int (*int_func)();
+  int_func callback = nullptr;
+  FCI5.Invoke((void*)&callback);
+  EXPECT_TRUE(callback);
+  EXPECT_EQ(callback(), 3);
+#endif
+
   // FIXME: Do we need to support private ctors?
   Interp->process(R"(
     class C {