Skip to content
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

Restore the TUScope only when we are not in incremental processing mode. #876

Merged
merged 1 commit into from
May 5, 2024
+6 −2
Merged

Restore the TUScope only when we are not in incremental processing mode. #876

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions tools/ClangPlugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,8 @@ namespace clad {
void CladPlugin::HandleTranslationUnit(ASTContext& C) {
Sema& S = m_CI.getSema();
// Restore the TUScope that became a 0 in Sema::ActOnEndOfTranslationUnit.
S.TUScope = m_StoredTUScope;
if (!m_CI.getPreprocessor().isIncrementalProcessingEnabled())
S.TUScope = m_StoredTUScope;
constexpr bool Enabled = true;
Sema::GlobalEagerInstantiationScope GlobalInstantiations(S, Enabled);
Sema::LocalEagerInstantiationScope LocalInstantiations(S);
Expand All @@ -409,8 +410,11 @@ namespace clad {
m_DiffRequestGraph.markCurrentNodeProcessed();
request = m_DiffRequestGraph.getNextToProcessNode();
}

// Put the TUScope in a consistent state after clad is done.
S.TUScope = nullptr;
if (!m_CI.getPreprocessor().isIncrementalProcessingEnabled())
S.TUScope = nullptr;

// Force emission of the produced pending template instantiations.
LocalInstantiations.perform();
GlobalInstantiations.perform();
Expand Down
Loading