Skip to content

Add required cling transactions when performing named lookups #853

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

Open
aaronj0 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add required cling transactions when performing named lookups #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaf076c
Add required cling transactions when performing named lookups
aaronj0 Mar 13, 2026
23fcf19
Drop cling guard when building lookup
aaronj0 Mar 24, 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
13 changes: 9 additions & 4 deletions lib/CppInterOp/CppInterOp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,10 +1024,7 @@ TCppScope_t GetNamed(const std::string& name,
D = GetUnderlyingScope(D);
Within = llvm::dyn_cast<clang::DeclContext>(D);
}
#ifdef CPPINTEROP_USE_CLING
if (Within)
Within->getPrimaryContext()->buildLookup();
#endif

compat::SynthesizingCodeRAII RAII(&getInterp());
auto* ND = CppInternal::utils::Lookup::Named(&getSema(), name, Within);
if (ND && ND != (clang::NamedDecl*)-1) {
Expand Down Expand Up @@ -1163,6 +1160,8 @@ int64_t GetBaseClassOffset(TCppScope_t derived, TCppScope_t base) {

assert(derived || base);

compat::SynthesizingCodeRAII RAII(&getInterp());

auto* DD = (Decl*)derived;
auto* BD = (Decl*)base;
if (!isa<CXXRecordDecl>(DD) || !isa<CXXRecordDecl>(BD))
Expand Down Expand Up @@ -1315,6 +1314,7 @@ std::vector<TCppFunction_t> GetFunctionsUsingName(TCppScope_t scope,
clang::LookupResult R(S, DName, SourceLocation(), Sema::LookupOrdinaryName,
RedeclarationKind::ForVisibleRedeclaration);

compat::SynthesizingCodeRAII RAII(&getInterp());
CppInternal::utils::Lookup::Named(&S, R, Decl::castToDeclContext(D));

if (R.empty())
Expand Down Expand Up @@ -1469,6 +1469,7 @@ bool ExistsFunctionTemplate(const std::string& name, TCppScope_t parent) {
Within = llvm::dyn_cast<DeclContext>(D);
}

compat::SynthesizingCodeRAII RAII(&getInterp());
auto* ND = CppInternal::utils::Lookup::Named(&getSema(), name, Within);

if ((intptr_t)ND == (intptr_t)0)
Expand Down Expand Up @@ -1517,6 +1518,8 @@ bool GetClassTemplatedMethods(const std::string& name, TCppScope_t parent,
clang::LookupResult R(S, DName, SourceLocation(), Sema::LookupOrdinaryName,
RedeclarationKind::ForVisibleRedeclaration);
auto* DC = clang::Decl::castToDeclContext(D);

compat::SynthesizingCodeRAII RAII(&getInterp());
CppInternal::utils::Lookup::Named(&S, R, DC);

if (R.getResultKind() == clang_LookupResult_Not_Found && funcs.empty())
Expand Down Expand Up @@ -1850,6 +1853,7 @@ TCppScope_t LookupDatamember(const std::string& name, TCppScope_t parent) {
Within = llvm::dyn_cast<clang::DeclContext>(D);
}

compat::SynthesizingCodeRAII RAII(&getInterp());
auto* ND = CppInternal::utils::Lookup::Named(&getSema(), name, Within);
if (ND && ND != (clang::NamedDecl*)-1) {
if (llvm::isa_and_nonnull<clang::FieldDecl>(ND)) {
Expand Down Expand Up @@ -1898,6 +1902,7 @@ intptr_t GetVariableOffset(compat::Interpreter& I, Decl* D,
return 0;

auto& C = I.getSema().getASTContext();
compat::SynthesizingCodeRAII RAII(&getInterp());

if (auto* FD = llvm::dyn_cast<FieldDecl>(D)) {
clang::RecordDecl* FieldParentRecordDecl = FD->getParent();
Expand Down
2 changes: 2 additions & 0 deletions lib/CppInterOp/CppInterOpInterpreter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ inline clang::NamespaceDecl* Namespace(clang::Sema* S, const char* Name,

inline void Named(clang::Sema* S, clang::LookupResult& R,
const clang::DeclContext* Within = nullptr) {
if (Within)
Within->getPrimaryContext()->buildLookup();
Copy link
Copy Markdown
Contributor

@github-actions github-actions Bot Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: 'this' argument to member function 'buildLookup' has type 'const DeclContext', but function is not marked const [clang-diagnostic-error]

    Within->getPrimaryContext()->buildLookup();
    ^
Additional context

llvm/include/clang/AST/DeclBase.h:2679: 'buildLookup' declared here

  StoredDeclsMap *buildLookup();
                  ^

R.suppressDiagnostics();
if (!Within)
S->LookupName(R, S->TUScope);
Expand Down
Loading