Skip to content

Commit b48a22e

Browse files
committed
Revert "[TCling] Invoke InterOp interpreter API in metacling"
This reverts commit bfa3a6e.
1 parent a7879d1 commit b48a22e

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

Diff for: core/metacling/src/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ target_include_directories(MetaCling SYSTEM PRIVATE
4444
${CLANG_INCLUDE_DIRS}
4545
${LLVM_INCLUDE_DIRS}
4646
${CLAD_INCLUDE_DIRS}
47-
${CPPINTEROP_INCLUDE_DIRS}
4847
)
4948

5049
target_include_directories(MetaCling PRIVATE
@@ -75,7 +74,7 @@ if(MSVC)
7574
set_source_files_properties(TCling.cxx COMPILE_FLAGS /bigobj)
7675
endif()
7776

78-
add_dependencies(MetaCling CLING clangCppInterOp)
77+
add_dependencies(MetaCling CLING)
7978

8079
##### libCling #############################################################
8180

@@ -114,14 +113,15 @@ ROOT_LINKER_LIBRARY(Cling
114113
$<TARGET_OBJECTS:ClingUtils>
115114
$<TARGET_OBJECTS:Dictgen>
116115
$<TARGET_OBJECTS:MetaCling>
117-
$<TARGET_OBJECTS:clangCppInterOp>
118116
LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS} ${CLING_PLUGIN_LINK_LIBS})
119117

120118
# When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.
121119
add_dependencies(Cling rootcling_stage1)
122-
if(testing)
123-
add_dependencies(Cling CppInterOpUnitTests)
124-
endif()
120+
121+
# if(testing)
122+
# add_dependencies(Cling CppInterOpUnitTests)
123+
# endif()
124+
125125

126126
if(MSVC)
127127
set_target_properties(Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)

Diff for: core/metacling/src/TCling.cxx

-7
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ clang/LLVM technology.
115115
#include "cling/Utils/SourceNormalization.h"
116116
#include "cling/Interpreter/Exception.h"
117117

118-
#include "clang/Interpreter/CppInterOp.h"
119-
120118
#include "llvm/IR/GlobalValue.h"
121119
#include "llvm/IR/Module.h"
122120

@@ -1541,11 +1539,6 @@ TCling::TCling(const char *name, const char *title, const char* const argv[], vo
15411539
if (!fInterpreter->getCI()) { // Compiler instance could not be created. See https://its.cern.ch/jira/browse/ROOT-10239
15421540
return;
15431541
}
1544-
1545-
// Tell CppInterOp that the cling::Interpreter instance is managed externally by ROOT
1546-
// Sets the interpreter by passing the fInterpreter handle as soon as TCling is initialized
1547-
Cpp::UseExternalInterpreter((Cpp::TInterp_t*)fInterpreter.get());
1548-
15491542
// Don't check whether modules' files exist.
15501543
fInterpreter->getCI()->getPreprocessorOpts().DisablePCHOrModuleValidation =
15511544
DisableValidationForModuleKind::All;

0 commit comments

Comments
 (0)