Enable CppInterOp

core/metacling/src/CMakeLists.txt

@@ -44,6 +44,7 @@ target_include_directories(MetaCling SYSTEM PRIVATE
   ${CLANG_INCLUDE_DIRS}
   ${LLVM_INCLUDE_DIRS}
   ${CLAD_INCLUDE_DIRS}
+  ${CPPINTEROP_INCLUDE_DIRS}
 )
 
 target_include_directories(MetaCling PRIVATE
@@ -74,7 +75,7 @@ if(MSVC)
    set_source_files_properties(TCling.cxx COMPILE_FLAGS /bigobj)
 endif()
 
-add_dependencies(MetaCling CLING)
+add_dependencies(MetaCling CLING clangCppInterOp)
 
 ##### libCling #############################################################
 
@@ -113,6 +114,7 @@ ROOT_LINKER_LIBRARY(Cling
         $<TARGET_OBJECTS:ClingUtils>
         $<TARGET_OBJECTS:Dictgen>
         $<TARGET_OBJECTS:MetaCling>
+        $<TARGET_OBJECTS:clangCppInterOp>
         LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS} ${CLING_PLUGIN_LINK_LIBS})
 
 # When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.

core/metacling/src/TCling.cxx

@@ -115,6 +115,8 @@ clang/LLVM technology.
 #include "cling/Utils/SourceNormalization.h"
 #include "cling/Interpreter/Exception.h"
 
+#include "clang/Interpreter/CppInterOp.h"
+
 #include "llvm/IR/GlobalValue.h"
 #include "llvm/IR/Module.h"
 
@@ -1609,6 +1611,12 @@ TCling::TCling(const char *name, const char *title, const char* const argv[], vo
       // Initialize the dyld for AutoloadLibraryGenerator.
       DLM.initializeDyld(ShouldPermanentlyIgnore);
    }
+
+   // Tell CppInterOp that the cling::Interpreter instance is managed externally by ROOT
+   // We pass the handle so it sets the ownership flags and sets the interpreter as soon as TCling is initialized 
+   if (!Cpp::GetInterpreter()) {
+      Cpp::UseExternalInterpreter((Cpp::TInterp_t*)fInterpreter.get());
+   }
 }
 
 

core/metacling/src/TClingCallFunc.cxx

@@ -67,6 +67,8 @@ C++ interpreter and the Clang C++ compiler, not CINT.
 
 #include "clang/Sema/SemaInternal.h"
 
+#include "clang/Interpreter/CppInterOp.h"
+
 #include <map>
 #include <string>
 #include <sstream>

interpreter/CMakeLists.txt

@@ -599,3 +599,29 @@ mark_as_advanced(FORCE BUG_REPORT_URL BUILD_CLANG_FORMAT_VS_PLUGIN BUILD_SHARED_
                        C_INCLUDE_DIRS DEFAULT_SYSROOT FFI_INCLUDE_DIR FFI_LIBRARY_DIR
                        GCC_INSTALL_PREFIX LIBCLANG_BUILD_STATIC TOOL_INFO_PLIST)
 mark_as_advanced(CLEAR LLVM_ENABLE_ASSERTIONS LLVM_BUILD_TYPE)
+
+
+##################### LIBINTEROP ###########################
+# Set the paths to Cling, Clang, and LLVM directories
+
+# if (cppinterop)
+
+  set(LLVM_DIR "${CMAKE_BINARY_DIR}/interpreter/llvm-project/llvm/lib/cmake/llvm")
+  set(Clang_DIR "${CMAKE_BINARY_DIR}/interpreter/llvm-project/llvm/tools/clang/lib/cmake/clang")
+  set(Cling_DIR "${CMAKE_BINARY_DIR}/interpreter/cling")
+  set(CPPINTEROP_INCLUDE_DIRS
+  ${CMAKE_SOURCE_DIR}/interpreter/CppInterOp/include
+  CACHE STRING "CppInterOp include directories.")
+
+  # message(STATUS "LLVM_DIR: ${LLVM_DIR}")
+  # message(STATUS "CLING: ${Cling_DIR}")
+  # message(STATUS "CLANG: ${Clang_DIR}")
+  # message(STATUS "CLANG INCLUDE DIR: ${CLANG_INCLUDE_DIRS}")
+  # message(STATUS "IOP INCLUDE DIR: ${CPPINTEROP_INCLUDE_DIRS}")
+
+  set(USE_CLING ON CACHE BOOL "Use Cling as backend" FORCE)
+  set(USE_REPL OFF CACHE BOOL "Use Clang-repl as backend" FORCE)
+
+  add_subdirectory(CppInterOp)
+
+# endif()

interpreter/CppInterOp/.clang-format

@@ -0,0 +1,17 @@
+BasedOnStyle: LLVM
+
+Language: Cpp
+Standard: Cpp11
+PointerAlignment: Left
+
+IncludeCategories:
+  - Regex:           '^"[^/]+\"'
+    Priority:        10
+  - Regex:           '^"cling/'
+    Priority:        20
+  - Regex:           '^"clang/'
+    Priority:        30
+  - Regex:           '^"llvm/'
+    Priority:        40
+  - Regex:           '^<'
+    Priority:        50

interpreter/CppInterOp/.clang-tidy

@@ -0,0 +1,59 @@
+Checks: >
+  -*,
+  bugprone-*,
+  clang-diagnostic-*,
+  clang-analyzer-*,
+  cppcoreguidelines-*,
+  llvm-*,
+  misc-*,
+  modernize-*,
+  performance-*,
+  portability-*,
+  readability-*,
+  -bugprone-narrowing-conversions,
+  -bugprone-easily-swappable-parameters,
+  -bugprone-implicit-widening-of-multiplication-result,
+  -bugprone-unchecked-optional-access,
+  -misc-const-correctness,
+  -misc-unused-parameters,
+  -misc-non-private-member-variables-in-classes,
+  -misc-no-recursion,
+  -misc-use-anonymous-namespace,
+  -modernize-return-braced-init-list,
+  -modernize-use-trailing-return-type,
+  -readability-braces-around-statements,
+  -readability-identifier-length,
+  -readability-implicit-bool-conversion,
+  -readability-magic-numbers,
+  -readability-named-parameter,
+  -readability-function-cognitive-complexity,
+  -readability-redundant-access-specifiers,
+  -cppcoreguidelines-avoid-magic-numbers,
+  -cppcoreguidelines-init-variables,
+  -cppcoreguidelines-pro-bounds-pointer-arithmetic,
+  -cppcoreguidelines-pro-type-member-init,
+  -llvm-namespace-comment
+
+CheckOptions:
+  - key:             readability-identifier-naming.ClassCase
+    value:           aNy_CasE
+  - key:             readability-identifier-naming.FunctionCase
+    value:           aNy_CasE
+  - key:             readability-identifier-naming.MemberCase
+    value:           aNy_CasE
+  - key:             readability-identifier-naming.ParameterCase
+    value:           aNy_CasE
+  - key:             readability-identifier-naming.UnionCase
+    value:           CamelCase
+  - key:             readability-identifier-naming.VariableCase
+    value:           aNy_CasE
+  - key:             readability-identifier-naming.IgnoreMainLikeFunctions
+    value:           1
+  - key:             cppcoreguidelines-avoid-magic-numbers.IgnoreMacros
+    value:           1
+  - key:             cppcoreguidelines-pro-bounds-pointer-arithmetic.Pessimistic
+    value:           1
+  - key:             cppcoreguidelines-pro-type-member-init.InitWithEquals
+    value:           1
+  - key:             llvm-namespace-comment.Spaces
+    value:           2

interpreter/CppInterOp/.codecov.yml

@@ -0,0 +1,25 @@
+codecov:
+  require_ci_to_pass: no
+
+coverage:
+  precision: 2
+  round: down
+  range: "70...100"
+
+  status:
+    project: yes
+    patch: yes
+    changes: no
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "reach, diff, flags, tree, files"
+  behavior: default
+  require_changes: no

interpreter/CppInterOp/.gitignore

@@ -0,0 +1,39 @@
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# Directories
+build
+install
+
+# CLion files
+.idea

interpreter/CppInterOp/.readthedocs.yaml

@@ -0,0 +1,16 @@
+version: 2
+
+sphinx:
+  configuration: docs/conf.py
+  builder: html
+
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.11"
+  apt_packages:
+    - clang-13
+    - cmake
+    - libclang-13-dev
+    - llvm-13-dev
+    - llvm-13-tools