Skip to content

[cxxmodules] Do not generate a rootmap if a module exists. #4005

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 17 commits into from
Jul 18, 2019
Merged

[cxxmodules] Do not generate a rootmap if a module exists. #4005

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3a39b07
[cxxmodules] Do not generate a rootmap if a module exists.
vgvassilev Jun 24, 2019
aa4a162
[rootcling] Simplify code. NFC
vgvassilev Jun 29, 2019
edab099
[cxxmodules] Generate library registration code only when needed.
vgvassilev Jul 5, 2019
8201f8b
[cxxmodules] Move the addition of extra underscore closer to its use.
vgvassilev Jul 6, 2019
d140fbd
[cxxmodules] Use pow of 2 to pre-allocate the string vector.
vgvassilev Jul 6, 2019
0db6d50
[cxxmodules] Improve code readability. NFC
vgvassilev Jul 6, 2019
2eb8880
[cxxmodules] Remove obsolete comment.
vgvassilev Jul 6, 2019
7507acc
[cxxmodules] Refactor to improve readability.
vgvassilev Jul 6, 2019
9ff1318
[cxxmodules] Move the creation of the llvm objectfile in Lookup*Symbols.
vgvassilev Jul 6, 2019
3261fae
[cxxmodules] Simplify code by moving the common pieces in a lambda. NFC
vgvassilev Jul 6, 2019
6686b1a
[cxxmodules] Merge sSysPaths and sPath.
vgvassilev Jul 7, 2019
41a2e0f
[cxxmodules] Do not rely on rootmaps to compute library dependencies …
vgvassilev Jul 9, 2019
5804412
[cling] Mark library search paths system and user accordingly.
vgvassilev Jul 9, 2019
a9858aa
[tcling] Determine if a file is a shared library in a more reliable way.
vgvassilev Jul 12, 2019
2d80674
Make the static function a local lambda.
vgvassilev Jul 12, 2019
98e2cc9
[cxxmodules] Rework finding symbols in the dynamic symbol section of …
vgvassilev Jul 16, 2019
ea2ea42
Suppress false positive warning.
vgvassilev Jul 17, 2019
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] Generate library registration code only when needed.
  • Loading branch information
@vgvassilev
vgvassilev committed Jul 18, 2019
commit edab0991a7848d8d7e67e5b078dd58caa5959217
5 changes: 3 additions & 2 deletions core/dictgen/src/TModuleGenerator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,9 @@ void TModuleGenerator::WriteRegistrationSource(std::ostream &out, const std::str
{
if (hasCxxModule) {
std::string emptyStr = "\"\"";
WriteRegistrationSourceImpl(out, GetDictionaryName(), GetDemangledDictionaryName(), {}, {}, emptyStr, "{}",
emptyStr, "0", "0",
WriteRegistrationSourceImpl(out, GetDictionaryName(), GetDemangledDictionaryName(), {}, {},
fwdDeclString, "{}",
emptyStr, headersClassesMapString, "0",
/*HasCxxModule*/ true);
return;
}
Expand Down
18 changes: 10 additions & 8 deletions core/dictgen/src/rootcling_impl.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4839,15 +4839,17 @@ int RootClingMain(int argc,
}


const std::string headersClassesMapString = GenerateStringFromHeadersForClasses(headersDeclsMap,
detectedUmbrella,
true);
std::string fwdDeclsString = "nullptr";
if (!gDriverConfig->fBuildingROOTStage1) {
if (!writeEmptyRootPCM)
fwdDeclsString = GenerateFwdDeclString(scan, interp);
std::string headersClassesMapString = "\"\"";
std::string fwdDeclsString = "\"\"";
if (!cxxmodule) {
headersClassesMapString = GenerateStringFromHeadersForClasses(headersDeclsMap,
detectedUmbrella,
true);
if (!gDriverConfig->fBuildingROOTStage1) {
if (!writeEmptyRootPCM)
fwdDeclsString = GenerateFwdDeclString(scan, interp);
}
}

modGen.WriteRegistrationSource(dictStream, fwdDeclnArgsToKeepString, headersClassesMapString, fwdDeclsString,
extraIncludes, cxxmodule);
// If we just want to inline the input header, we don't need
Expand Down