Skip to content

[cxxmodules] Start generating modules in rootcling. #930

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 3 commits into from
Sep 14, 2017
Merged

[cxxmodules] Start generating modules in rootcling. #930

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d97589
[cxxmodules] Extended InvocationOptions with C++ modules flags.
Teemperor Jul 18, 2017
5b060f0
[cxxmodules] Now configuring C++ modules in CIFactory on -fmodules.
Teemperor Sep 1, 2017
f89d5f1
[cxxmodules] Start generating C++ modules in rootcling.
Teemperor Sep 3, 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
Next Next commit
[cxxmodules] Extended InvocationOptions with C++ modules flags. 
This makes it easier for cling to check if -fmodules and/or
-fmodule-name is passed so that we can act on these flags in the
CIFactory.
  • Loading branch information
@Teemperor
Teemperor committed Sep 14, 2017
commit 9d975897d114d9c3a91da51a649058b1da38ea53
6 changes: 6 additions & 0 deletions interpreter/cling/include/cling/Interpreter/InvocationOptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ namespace cling {
unsigned StdLib : 1;
unsigned HasOutput : 1;
unsigned Verbose : 1;
unsigned CxxModules : 1;
/// \brief The output path of any C++ PCMs we're building on demand.
/// Equal to ModuleCachePath in the HeaderSearchOptions.
std::string CachePath;
Copy link
Member

@Axel-Naumann Axel-Naumann Sep 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you throw in what you're caching, I guess ModuleCachePath?

Copy link
Contributor Author

@Teemperor Teemperor Sep 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks!

// If not empty, the name of the module we're currently compiling.
std::string ModuleName;

///\brief The remaining arguments to pass to clang.
///
Expand Down
12 changes: 8 additions & 4 deletions interpreter/cling/lib/Interpreter/InvocationOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ static const char kNoStdInc[] = "-nostdinc";
}
}

CompilerOptions::CompilerOptions(int argc, const char* const* argv) :
Language(false), ResourceDir(false), SysRoot(false), NoBuiltinInc(false),
NoCXXInc(false), StdVersion(false), StdLib(false), HasOutput(false),
Verbose(false) {
CompilerOptions::CompilerOptions(int argc, const char* const* argv)
: Language(false), ResourceDir(false), SysRoot(false), NoBuiltinInc(false),
NoCXXInc(false), StdVersion(false), StdLib(false), HasOutput(false),
Verbose(false), CxxModules(false) {
if (argc && argv) {
// Preserve what's already in Remaining, the user might want to push args
// to clang while still using main's argc, argv
Expand Down Expand Up @@ -136,6 +136,10 @@ void CompilerOptions::Parse(int argc, const char* const argv[],
// case options::OPT_nostdinc:
case options::OPT_nostdincxx: NoCXXInc = true; break;
case options::OPT_v: Verbose = true; break;
case options::OPT_fmodules: CxxModules = true; break;
case options::OPT_fmodule_name_EQ: LLVM_FALLTHROUGH;
case options::OPT_fmodule_name: ModuleName = arg->getValue(); break;
case options::OPT_fmodules_cache_path: CachePath = arg->getValue(); break;

default:
if (Inputs && arg->getOption().getKind() == Option::InputClass)
Expand Down