Skip to content

[cxxmodules] Teach TCling::RegisterModule to work with real module fi… #1356

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
vgvassilev merged 7 commits into from
Nov 28, 2017
+32 −10
Merged

[cxxmodules] Teach TCling::RegisterModule to work with real module fi… #1356

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
874c508
[cxxmodules] Teach TCling::RegisterModule to work with real module fi…
vgvassilev Nov 23, 2017
a41c500
[cxxmodules] Switch off header parsing if we loaded a module.
vgvassilev Nov 25, 2017
8245f6d
[cxxmodules] Complain only when the module was in a modulemap.
vgvassilev Nov 25, 2017
271a004
Remove obsolete comment.
vgvassilev Nov 25, 2017
a5e9df4
[cxxmodules] Bail out early if we found a module.
vgvassilev Nov 25, 2017
721424a
[cxxmodules] Report if the module was resolved but invisible.
vgvassilev Nov 27, 2017
fdb2f41
[cxxmodules] Use another sloc. Do not trigger nested parsing.
vgvassilev Nov 28, 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
[cxxmodules] Report if the module was resolved but invisible.
  • Loading branch information
@vgvassilev
vgvassilev committed Nov 28, 2017
commit 721424ac7c85925e81235c638da1aa8fb9997c39
11 changes: 9 additions & 2 deletions core/metacling/src/TClingCallbacks.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,15 @@ void TClingCallbacks::InclusionDirective(clang::SourceLocation sLoc/*HashLoc*/,
llvm::StringRef /*RelativePath*/,
const clang::Module * Imported) {
// We found a module. Do not try to do anything else.
if (Imported)
return;
if (Imported) {
Sema &SemaR = m_Interpreter->getSema();
// FIXME: We should make the module visible at that point.
if (!SemaR.isModuleVisible(Imported))
ROOT::TMetaUtils::Info("TClingCallbacks::InclusionDirective",
"Module %s resolved but not visible!", Imported->Name.c_str());
else
return;
}

// Method called via Callbacks->InclusionDirective()
// in Preprocessor::HandleIncludeDirective(), invoked whenever an
Expand Down