[cppinterop] Upgrade to upstream 7cb23ca4

interpreter/CppInterOp/CMakeLists.txt

@@ -17,6 +17,12 @@ option(CPPINTEROP_BUILD_TABLEGEN_ONLY "Only build cppinterop-tblgen (for cross-c
 #=Set OFF to suppress install() rules and route clangCppInterOp through
 # add_llvm_library(... BUILDTREE_ONLY)
 option(CPPINTEROP_INSTALL "Generate install rules for CppInterOp" ON)
+
+# OFF to ship the shared library as a single unversioned file, matching
+# the Darwin layout: archives that cannot carry symlinks (Python wheels)
+# would otherwise materialize the SOVERSION namelink as a second full copy.
+option(CPPINTEROP_SHARED_LIBRARY_VERSIONING
+  "Attach the LLVM SOVERSION and namelink to shared clangCppInterOp" ON)
 if(EMSCRIPTEN)
   set(CPPINTEROP_EXTRA_WASM_FLAGS "-fwasm-exceptions" CACHE STRING "Extra flags for wasm")
 endif()
@@ -504,6 +510,7 @@ if(CPPINTEROP_INSTALL)
 
   install(DIRECTORY include/
     DESTINATION include
+    COMPONENT cppinterop-headers
     FILES_MATCHING
     PATTERN "*.def"
     PATTERN "*.h"
@@ -513,12 +520,14 @@ if(CPPINTEROP_INSTALL)
 
   install(DIRECTORY tools/
     DESTINATION include/CppInterOp/tools
+    COMPONENT cppinterop-headers
     FILES_MATCHING
     PATTERN "*.h"
   )
 
   install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/
     DESTINATION include
+    COMPONENT cppinterop-headers
     FILES_MATCHING
     PATTERN "CMakeFiles" EXCLUDE
     PATTERN "*.inc"
@@ -617,6 +626,17 @@ if(NOT EMSCRIPTEN AND NOT CPPINTEROP_TABLEGEN_EXE)
   add_subdirectory(utils/TableGen)
 endif()
 add_subdirectory(lib)
+
+if(CPPINTEROP_INSTALL)
+  # Installing the headers needs to depend on generating the tablegen'd
+  # public headers.
+  add_custom_target(cppinterop-headers DEPENDS CppInterOpTableGen)
+  if(NOT LLVM_ENABLE_IDE)
+    add_llvm_install_targets(install-cppinterop-headers
+                             DEPENDS cppinterop-headers
+                             COMPONENT cppinterop-headers)
+  endif()
+endif()
 if (CPPINTEROP_ENABLE_TESTING)
   add_subdirectory(unittests)
 endif(CPPINTEROP_ENABLE_TESTING)

interpreter/CppInterOp/cmake/modules/GoogleTest.cmake

@@ -84,7 +84,7 @@ ExternalProject_Add(
   googletest
   GIT_REPOSITORY https://github.com/google/googletest.git
   GIT_SHALLOW FALSE
-  GIT_TAG fa8438ae6b70c57010177de47a9f13d7041a6328
+  GIT_TAG v1.18.0
   UPDATE_COMMAND ""
   ${_gtest_configure}
   BUILD_COMMAND ${build_cmd}

interpreter/CppInterOp/cppinterop-version.tag

@@ -1 +1 @@
-bdf062f298a20c13c44edacfd55170dbd3ad56ca
+7cb23ca494cdaf3d5e6cc57318c4f561abcf1d84

interpreter/CppInterOp/etc/lsan-cling.supp

@@ -0,0 +1,14 @@
+# Two cling interpreter-teardown leaks, fixed in root-project/root#23045;
+# suppress until the fixes reach root-project/cling. Applied only to the
+# cling+Address row; the clang-repl asan row runs unsuppressed.
+#
+# 1. deallocate() retains code via FinalizedAlloc::release(), orphaning
+#    each allocation's DeallocActions vector (eh-frame deregistration,
+#    new with LLVM 22).
+# 2. ShutDown() leaks the frontend through the DisableFree path and hides
+#    the pointers with llvm::BuryPointer, which only holds 16 pointers;
+#    destroying a few interpreters per process overflows it.
+#
+# The allocation stacks are often 2 frames deep (the fast unwinder stops
+# at JIT frames), hence the module-level match.
+leak:libclangCppInterOp

interpreter/CppInterOp/include/CppInterOp/CppInterOpTypes.h

@@ -412,7 +412,19 @@ enum class AllocType : unsigned char {
   NewArr,
   Malloc,
   Unknown,
-  CustomAlloc
+  CustomAlloc,
+  Null,
+  OperatorNew,
+  OperatorNewArr
+};
+
+enum class DeallocType : unsigned char {
+  None,
+  Delete,
+  DeleteArr,
+  Free,
+  Unknown, // Contradiction, delete x or delete[] x in same func
+  Opaque   // Could not analyze
 };
 
 inline QualKind operator|(QualKind a, QualKind b) {

interpreter/CppInterOp/lib/CppInterOp/CMakeLists.txt

@@ -225,6 +225,13 @@ add_llvm_library(clangCppInterOp
   ${link_libs}
 )
 
+# llvm_add_library() stamps LLVM's VERSION/SOVERSION on shared libraries on
+# ELF platforms; unsetting them ships one unversioned file, as on Darwin.
+if(NOT CPPINTEROP_SHARED_LIBRARY_VERSIONING)
+  set_property(TARGET clangCppInterOp PROPERTY VERSION)
+  set_property(TARGET clangCppInterOp PROPERTY SOVERSION)
+endif()
+
 if(EMSCRIPTEN)
   if(BUILD_SHARED_LIBS)
   # FIXME: When dynamically linking the Emscripten shared library to the
@@ -275,6 +282,3 @@ string(REPLACE ";" "\;" _VER CPPINTEROP_VERSION)
 set_source_files_properties(CppInterOp.cpp PROPERTIES COMPILE_DEFINITIONS
   "LLVM_BINARY_DIR=\"${LLVM_BINARY_DIR}\";CPPINTEROP_VERSION=\"${_VAR}\""
 )
-if(MSVC)
-  set_source_files_properties(CppInterOp.cpp COMPILE_FLAGS /bigobj)
-endif()