Skip to content

[clang] Correctly RAII reset two "new" Sema fields #15004

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
hahnjo merged 3 commits into from
Apr 2, 2024
Merged

[clang] Correctly RAII reset two "new" Sema fields #15004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5319c89
[clang] Correctly RAII reset two "new" Sema fields
hahnjo Mar 18, 2024
615d6c6
[clang] Reuse ContextRAII for ContextAndScopeRAII
hahnjo Mar 18, 2024
fd66a49
[llvm-project] Bump to tag ROOT-llvm16-20240402-01
hahnjo Apr 2, 2024
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
19 changes: 5 additions & 14 deletions interpreter/llvm-project/clang/include/clang/Sema/Sema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,30 +1048,21 @@ class Sema final {
class ContextAndScopeRAII {
private:
Sema &S;
DeclContext *SavedContext;
ContextRAII SavedContext;
Scope *SavedScope;
ProcessingContextState SavedContextState;
QualType SavedCXXThisTypeOverride;

public:
ContextAndScopeRAII(Sema &S, DeclContext *ContextToPush, Scope *ScopeToPush)
: S(S), SavedContext(S.CurContext), SavedScope(S.CurScope),
SavedContextState(S.DelayedDiagnostics.pushUndelayed()),
SavedCXXThisTypeOverride(S.CXXThisTypeOverride)
: S(S), SavedContext(S, ContextToPush), SavedScope(S.CurScope)
{
assert(ContextToPush && "pushing null context");
S.CurContext = ContextToPush;
S.CurScope = ScopeToPush;
}

void pop() {
if (!SavedContext) return;
S.CurContext = SavedContext;
SavedContext.pop();
if (!SavedScope) return;
S.CurScope = SavedScope;
S.DelayedDiagnostics.popUndelayed(SavedContextState);
S.CXXThisTypeOverride = SavedCXXThisTypeOverride;
SavedContext = 0;
SavedScope = 0;
SavedScope = nullptr;
}

~ContextAndScopeRAII() {
Expand Down
2 changes: 1 addition & 1 deletion interpreter/llvm-project/llvm-project.tag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ROOT-llvm16-20240321-01
ROOT-llvm16-20240402-01