Skip to content

Find scope parser raii #4358

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
pcanal merged 12 commits into from
Sep 9, 2019
Merged

Find scope parser raii #4358

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b770487
Correct the TClass state when created from a ClassInfo
pcanal Sep 4, 2019
1d98c55
Move declaration next to use
pcanal Sep 4, 2019
6f65ddc
Add comment explanation the choice of name used in recording.
pcanal Sep 4, 2019
bcf2864
Use fully qualified name as expected further
pcanal Sep 4, 2019
ada6166
Don't record an invalid ClassInfo
pcanal Sep 4, 2019
89a8584
In UpdateClassInfoWithDecl, avoid lookup when not needed.
pcanal Sep 4, 2019
efa1c77
Expand StartParsingRAII
pcanal Sep 6, 2019
ab78486
[NFC] Clang-formatting
pcanal Sep 6, 2019
12eb144
Improve type safety
pcanal Sep 6, 2019
59ddae9
In UpdateClassInfoWithDecl, ignore incomplete definition.
pcanal Sep 6, 2019
d739e7f
In UpdateClassInfoWithDecl, improve semantic use of variable name.
pcanal Sep 6, 2019
609c965
In UpdateClassInfoWithDecl fix support for namespace (in RefreshClass…
pcanal Sep 6, 2019
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
Prev Previous commit
In UpdateClassInfoWithDecl fix support for namespace (in RefreshClass… 
…Info)
  • Loading branch information
@pcanal
pcanal committed Sep 6, 2019
commit 609c9655ab7dd2ed62ebe33a8e5ea1990a1c1861
24 changes: 15 additions & 9 deletions core/metacling/src/TCling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6468,18 +6468,18 @@ Bool_t TCling::IsAutoLoadNamespaceCandidate(const clang::NamespaceDecl* nsDecl)
////////////////////////////////////////////////////////////////////////////////
/// Internal function. Actually do the update of the ClassInfo when seeing
// new TagDecl or NamespaceDecl.
void TCling::RefreshClassInfo(TClass *cl, const clang::TagDecl *tdDef, bool alias)
void TCling::RefreshClassInfo(TClass *cl, const clang::NamedDecl *def, bool alias)
{

TClingClassInfo *cci = ((TClingClassInfo *)cl->fClassInfo);
if (cci) {
// If we only had a forward declaration then update the
// TClingClassInfo with the definition if we have it now.
const TagDecl *tdOld = llvm::dyn_cast_or_null<TagDecl>(cci->GetDecl());
if (!tdOld || (tdDef && tdDef != tdOld)) {
const NamedDecl *oldDef = llvm::dyn_cast_or_null<NamedDecl>(cci->GetDecl());
if (!oldDef || (def && def != oldDef)) {
cl->ResetCaches();
TClass::RemoveClassDeclId(cci->GetDeclId());
if (tdDef) {
if (def) {
// It's a tag decl, not a namespace decl.
cci->Init(*cci->GetType());
TClass::AddClassToDeclIdMap(cci->GetDeclId(), cl);
Expand All @@ -6490,8 +6490,8 @@ void TCling::RefreshClassInfo(TClass *cl, const clang::TagDecl *tdDef, bool alia
// yes, this is almost a waste of time, but we do need to lookup
// the 'type' corresponding to the TClass anyway in order to
// preserve the opaque typedefs (Double32_t)
if (!alias)
cl->fClassInfo = (ClassInfo_t *)new TClingClassInfo(fInterpreter, tdDef);
if (!alias && def != nullptr)
cl->fClassInfo = (ClassInfo_t *)new TClingClassInfo(fInterpreter, def);
else
cl->fClassInfo = (ClassInfo_t *)new TClingClassInfo(fInterpreter, cl->GetName());
if (((TClingClassInfo *)cl->fClassInfo)->IsValid()) {
Expand All @@ -6513,11 +6513,14 @@ void TCling::RefreshClassInfo(TClass *cl, const clang::TagDecl *tdDef, bool alia
/// Internal function. Inform a TClass about its new TagDecl or NamespaceDecl.
void TCling::UpdateClassInfoWithDecl(const NamedDecl* ND)
{
const TagDecl* td = dyn_cast<TagDecl>(ND);
const TagDecl *td = dyn_cast<TagDecl>(ND);
const NamespaceDecl *ns = dyn_cast<NamespaceDecl>(ND);
const NamedDecl *canon = nullptr;

std::string name;
TagDecl* tdDef = 0;
if (td) {
tdDef = td->getDefinition();
canon = tdDef = td->getDefinition();
// Let's pass the decl to the TClass only if it has a definition.
if (!tdDef) return;

Expand All @@ -6540,6 +6543,9 @@ void TCling::UpdateClassInfoWithDecl(const NamedDecl* ND)

clang::QualType type(tdDef->getTypeForDecl(), 0);
ROOT::TMetaUtils::GetNormalizedName(name, type, *fInterpreter, *fNormalizedCtxt);
} else if (ns) {
canon = ns->getCanonicalDecl();
name = ND->getQualifiedNameAsString();
} else {
name = ND->getQualifiedNameAsString();
}
Expand All @@ -6552,7 +6558,7 @@ void TCling::UpdateClassInfoWithDecl(const NamedDecl* ND)
// for example vector<double> and vector<Double32_t>
TClass* cl = (TClass*)gROOT->GetListOfClasses()->FindObject(name.c_str());
if (cl && GetModTClasses().find(cl) == GetModTClasses().end()) {
RefreshClassInfo(cl, tdDef, false);
RefreshClassInfo(cl, canon, false);
}
// And here we should find the other 'aliases' (eg. vector<Double32_t>)
// and update them too:
Expand Down
2 changes: 1 addition & 1 deletion core/metacling/src/TCling.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ class TCling final : public TInterpreter {

static void UpdateClassInfo(char* name, Long_t tagnum);
static void UpdateClassInfoWork(const char* name);
void RefreshClassInfo(TClass *cl, const clang::TagDecl *td, bool alias);
void RefreshClassInfo(TClass *cl, const clang::NamedDecl *def, bool alias);
void UpdateClassInfoWithDecl(const clang::NamedDecl* ND);
static void UpdateAllCanvases();

Expand Down