Skip to content

ROOT-Cling specific changes required for Cppyy in ROOT #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcbarton merged 2 commits into from
Feb 5, 2026
Merged

ROOT-Cling specific changes required for Cppyy in ROOT #787

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d77b1e
ROOT-Cling specific changes required for Cppyy in ROOT
Vipul-Cariappa Jan 27, 2026
c798d24
Sink usage of Cling `PushTransactionRAII` with `SynthesizingCodeRAII`
aaronj0 Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 17 additions & 28 deletions lib/CppInterOp/CppInterOp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,9 +383,7 @@ bool IsComplete(TCppScope_t scope) {
QualType QT = QualType::getFromOpaquePtr(GetTypeFromScope(scope));
clang::Sema& S = getSema();
SourceLocation fakeLoc = GetValidSLoc(S);
#ifdef CPPINTEROP_USE_CLING
cling::Interpreter::PushTransactionRAII RAII(&getInterp());
#endif // CPPINTEROP_USE_CLING
compat::SynthesizingCodeRAII RAII(&getInterp());
return S.isCompleteType(fakeLoc, QT);
}

Expand Down Expand Up @@ -799,8 +797,8 @@ TCppScope_t GetNamed(const std::string& name,
#ifdef CPPINTEROP_USE_CLING
if (Within)
Within->getPrimaryContext()->buildLookup();
cling::Interpreter::PushTransactionRAII RAII(&getInterp());
#endif
compat::SynthesizingCodeRAII RAII(&getInterp());
auto* ND = CppInternal::utils::Lookup::Named(&getSema(), name, Within);
if (ND && ND != (clang::NamedDecl*)-1) {
return (TCppScope_t)(ND->getCanonicalDecl());
Expand Down Expand Up @@ -850,7 +848,7 @@ TCppScope_t GetBaseClass(TCppScope_t klass, TCppIndex_t ibase) {

auto type = (CXXRD->bases_begin() + ibase)->getType();
if (auto RT = type->getAs<RecordType>())
return (TCppScope_t)RT->getDecl();
return (TCppScope_t)RT->getDecl()->getCanonicalDecl();

return 0;
}
Expand Down Expand Up @@ -958,9 +956,7 @@ static void GetClassDecls(TCppScope_t klass,
return;

auto* CXXRD = dyn_cast<CXXRecordDecl>(D);
#ifdef CPPINTEROP_USE_CLING
cling::Interpreter::PushTransactionRAII RAII(&getInterp());
#endif // CPPINTEROP_USE_CLING
compat::SynthesizingCodeRAII RAII(&getInterp());
if (CXXRD->hasDefinition())
CXXRD = CXXRD->getDefinition();
getSema().ForceDeclarationOfImplicitMembers(CXXRD);
Expand Down Expand Up @@ -1018,6 +1014,7 @@ TCppFunction_t GetDefaultConstructor(compat::Interpreter& interp,
return nullptr;

auto* CXXRD = (clang::CXXRecordDecl*)scope;
compat::SynthesizingCodeRAII RAII(&getInterp());
return interp.getCI()->getSema().LookupDefaultConstructor(CXXRD);
}

Expand Down Expand Up @@ -1281,9 +1278,7 @@ BestOverloadFunctionMatch(const std::vector<TCppFunction_t>& candidates,
auto& S = getSema();
auto& C = S.getASTContext();

#ifdef CPPINTEROP_USE_CLING
cling::Interpreter::PushTransactionRAII RAII(&getInterp());
#endif
compat::SynthesizingCodeRAII RAII(&getInterp());

// The overload resolution interfaces in Sema require a list of expressions.
// However, unlike handwritten C++, we do not always have a expression.
Expand Down Expand Up @@ -1655,7 +1650,8 @@ intptr_t GetVariableOffset(compat::Interpreter& I, Decl* D,
}
if (auto* RD = llvm::dyn_cast<CXXRecordDecl>(FieldParentRecordDecl)) {
// add in the offsets for the (multi level) base classes
while (BaseCXXRD != RD->getCanonicalDecl()) {
RD = RD->getCanonicalDecl();
while (BaseCXXRD != RD) {
CXXRecordDecl* Parent = direction.at(RD);
offset +=
C.getASTRecordLayout(Parent).getBaseClassOffset(RD).getQuantity();
Expand All @@ -1679,9 +1675,7 @@ intptr_t GetVariableOffset(compat::Interpreter& I, Decl* D,
address = I.getAddressOfGlobal(GD);
if (!address) {
if (!VD->hasInit()) {
#ifdef CPPINTEROP_USE_CLING
cling::Interpreter::PushTransactionRAII RAII(&getInterp());
#endif // CPPINTEROP_USE_CLING
compat::SynthesizingCodeRAII RAII(&getInterp());
getSema().InstantiateVariableDefinition(SourceLocation(), VD);
VD = VD->getDefinition();
}
Expand Down Expand Up @@ -2611,6 +2605,7 @@ int get_wrapper_code(compat::Interpreter& I, const FunctionDecl* FD,
//
bool needInstantiation = false;
const FunctionDecl* Definition = 0;
compat::SynthesizingCodeRAII RAII(&getInterp());
if (!FD->isDefined(Definition)) {
FunctionDecl::TemplatedKind TK = FD->getTemplatedKind();
switch (TK) {
Expand Down Expand Up @@ -3887,11 +3882,8 @@ TCppScope_t InstantiateTemplate(compat::Interpreter& I, TCppScope_t tmpl,
}

TemplateDecl* TmplD = static_cast<TemplateDecl*>(tmpl);

// We will create a new decl, push a transaction.
#ifdef CPPINTEROP_USE_CLING
cling::Interpreter::PushTransactionRAII RAII(&I);
#endif
compat::SynthesizingCodeRAII RAII(&getInterp());
return InstantiateTemplate(TmplD, TemplateArgs, S, instantiate_body);
}

Expand Down Expand Up @@ -3950,9 +3942,7 @@ void GetAllCppNames(TCppScope_t scope, std::set<std::string>& names) {
clang::DeclContext* DC;
clang::DeclContext::decl_iterator decl;

#ifdef CPPINTEROP_USE_CLING
cling::Interpreter::PushTransactionRAII RAII(&getInterp());
#endif
compat::SynthesizingCodeRAII RAII(&getInterp());

if (auto* TD = dyn_cast_or_null<TagDecl>(D)) {
DC = clang::TagDecl::castToDeclContext(TD);
Expand Down Expand Up @@ -4030,9 +4020,7 @@ bool IsTypeDerivedFrom(TCppType_t derived, TCppType_t base) {
auto derivedType = clang::QualType::getFromOpaquePtr(derived);
auto baseType = clang::QualType::getFromOpaquePtr(base);

#ifdef CPPINTEROP_USE_CLING
cling::Interpreter::PushTransactionRAII RAII(&getInterp());
#endif
compat::SynthesizingCodeRAII RAII(&getInterp());
return S.IsDerivedFrom(fakeLoc, derivedType, baseType);
}

Expand All @@ -4051,6 +4039,7 @@ std::string GetFunctionArgDefault(TCppFunction_t func,
std::string Result;
llvm::raw_string_ostream OS(Result);
Expr* DefaultArgExpr = nullptr;
compat::SynthesizingCodeRAII RAII(&getInterp());
if (PI->hasUninstantiatedDefaultArg())
DefaultArgExpr = PI->getUninstantiatedDefaultArg();
else
Expand Down Expand Up @@ -4136,6 +4125,7 @@ OperatorArity GetOperatorArity(TCppFunction_t op) {
void GetOperator(TCppScope_t scope, Operator op,
std::vector<TCppFunction_t>& operators, OperatorArity kind) {
Decl* D = static_cast<Decl*>(scope);
compat::SynthesizingCodeRAII RAII(&getInterp());
if (auto* CXXRD = llvm::dyn_cast_or_null<CXXRecordDecl>(D)) {
auto fn = [&operators, kind, op](const RecordDecl* RD) {
ASTContext& C = RD->getASTContext();
Expand Down Expand Up @@ -4365,10 +4355,9 @@ void CodeComplete(std::vector<std::string>& Results, const char* code,
}

int Undo(unsigned N) {
compat::SynthesizingCodeRAII RAII(&getInterp());
#ifdef CPPINTEROP_USE_CLING
auto& I = getInterp();
cling::Interpreter::PushTransactionRAII RAII(&I);
I.unload(N);
getInterp().unload(N);
return compat::Interpreter::kSuccess;
#else
return getInterp().undo(N);
Expand Down
Loading