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

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
Next Next commit
In UpdateClassInfoWithDecl, improve semantic use of variable name. 
I.e. don't reuse a variable for a slightly different menaing.
  • Loading branch information
@pcanal
pcanal committed Sep 6, 2019
commit d739e7fd5bdbac74f8e16738e4ec3c4f4d79cad8
8 changes: 3 additions & 5 deletions core/metacling/src/TCling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6520,16 +6520,14 @@ void TCling::UpdateClassInfoWithDecl(const NamedDecl* ND)
tdDef = td->getDefinition();
// Let's pass the decl to the TClass only if it has a definition.
if (!tdDef) return;
td = tdDef;
ND = td;

if (!td->isCompleteDefinition() || llvm::isa<clang::FunctionDecl>(td->getDeclContext())) {
if (!tdDef->isCompleteDefinition() || llvm::isa<clang::FunctionDecl>(tdDef->getDeclContext())) {
// Ignore incomplete definition.
// Ignore declaration within a function.
return;
}

auto declName=ND->getNameAsString();
auto declName = tdDef->getNameAsString();
// Check if we have registered the unqualified name into the list
// of TClass that are in kNoInfo, kEmulated or kFwdDeclaredState.
// Since this is used as heureutistic to avoid spurrious calls to GetNormalizedName
Expand All @@ -6540,7 +6538,7 @@ void TCling::UpdateClassInfoWithDecl(const NamedDecl* ND)
return;
}

clang::QualType type(td->getTypeForDecl(), 0);
clang::QualType type(tdDef->getTypeForDecl(), 0);
ROOT::TMetaUtils::GetNormalizedName(name, type, *fInterpreter, *fNormalizedCtxt);
} else {
name = ND->getQualifiedNameAsString();
Expand Down