Skip to content

[testing][cxxmodules]Reuse def loc #1378

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

Closed
Teemperor wants to merge 5 commits into from
Closed

[testing][cxxmodules]Reuse def loc #1378

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2b3e7e
[testing][cxxmodules] Load module in payload instead
Teemperor Nov 27, 2017
0b27e37
Fixed macro loading from module
Teemperor Nov 27, 2017
dc625b2
Also include assert
Teemperor Nov 27, 2017
5522d90
No more parsing to get a loc
Teemperor Nov 27, 2017
b19a742
Undef I again
Teemperor Nov 27, 2017
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
Fixed macro loading from module
  • Loading branch information
@Teemperor
Teemperor committed Nov 27, 2017
commit 0b27e37d2eb88f14c32d8eb8754a88905cd532d5
6 changes: 5 additions & 1 deletion core/metacling/src/TCling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,9 @@ static bool LoadModule(const std::string &ModuleName, cling::Interpreter &interp
cling::Interpreter::PushTransactionRAII RAII(&interp);
if (clang::Module *M = moduleMap.findModule(ModuleName)) {
clang::IdentifierInfo *II = PP.getIdentifierInfo(M->Name);
return !CI.getSema().ActOnModuleImport(ValidLoc, ValidLoc, std::make_pair(II, ValidLoc)).isInvalid();
bool Result = !CI.getSema().ActOnModuleImport(ValidLoc, ValidLoc, std::make_pair(II, ValidLoc)).isInvalid();
PP.makeModuleVisible(M, ValidLoc);
return Result;
}
return false;
}
Expand Down Expand Up @@ -1138,6 +1140,8 @@ static void LoadCoreModules(cling::Interpreter &interp)

if (!LoadModule(moduleMap.findModule("RIO")->Name, interp))
Error("TCling::LoadCodeModule", "Cannot load module RIO");

assert(interp.getMacro("gROOT") && "Couldn't load gROOT macro?");
}

static bool FileExists(const char *file)
Expand Down