gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reset Sema::CurContext to TU before auto-import:

Browse Source 
Sema create an ImportDecl, and that should not end up e.g. inside
a class definition, or wherever else the "autoparsing" was triggered.
Fixes roottest-root-meta-assertVarOffset.

(cherry picked from commit 4d8fcf0984118663a356d462eeec6cb6c34ebfef)
This commit is contained in:
Axel Naumann 2020-11-03 12:44:23 +01:00 committed by jenkins
parent 02ec8bf986
commit eac42c613b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Interpreter/Interpreter.cpp
View File

@ -870,9 +870,15 @@ namespace cling {
Preprocessor& PP = getCI()->getPreprocessor();
IdentifierInfo* II = PP.getIdentifierInfo(M->Name);
SourceLocation ValidLoc = getNextAvailableLoc();
// Don't push the ImportDecl into a ClassDecl or whatever - who knows which
// context triggered this import!
DeclContext *OldDC = getSema().CurContext;
getSema().CurContext = getSema().getASTContext().getTranslationUnitDecl();
bool success =
!getSema().ActOnModuleImport(ValidLoc, /*ExportLoc*/ {}, ValidLoc,
std::make_pair(II, ValidLoc)).isInvalid();
getSema().CurContext = OldDC;
if (success) {
// Also make the module visible in the preprocessor to export its macros.