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

Cleanup cruft from CreateHostTargetMachine.

Browse Source
This commit is contained in:
Frederich Munch 2017-03-15 16:55:16 -04:00 committed by sftnight
parent 9f84b5ebfc
commit 95c67cb818
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Interpreter/IncrementalExecutor.cpp
View File

@ -40,29 +40,19 @@ namespace cling {
namespace {
static std::unique_ptr<TargetMachine>
CreateHostTargetMachine(const clang::CompilerInstance& CI, unsigned Fmt = 0) {
CreateHostTargetMachine(const clang::CompilerInstance& CI) {
const clang::TargetOptions& TargetOpts = CI.getTargetOpts();
const clang::CodeGenOptions& CGOpt = CI.getCodeGenOpts();
Triple TheTriple(TargetOpts.Triple);
if (Fmt) {
assert(Fmt > llvm::Triple::UnknownObjectFormat &&
Fmt <= llvm::Triple::MachO && "Invalid Format");
TheTriple.setObjectFormat(static_cast<llvm::Triple::ObjectFormatType>(Fmt));
}
const std::string& Triple = TargetOpts.Triple;
std::string Error;
const Target *TheTarget
= TargetRegistry::lookupTarget(TheTriple.getTriple(), Error);
const Target *TheTarget = TargetRegistry::lookupTarget(Triple, Error);
if (!TheTarget) {
cling::errs() << "cling::IncrementalExecutor: unable to find target:\n"
<< Error;
return std::unique_ptr<TargetMachine>();
}
std::string MCPU;
std::string FeaturesStr;
llvm::TargetOptions Options = llvm::TargetOptions();
// We have to use large code model for PowerPC64 because TOC and text sections
// can be more than 2GB apart.
#if defined(__powerpc64__) || defined(__PPC64__)
@ -79,15 +69,16 @@ CreateHostTargetMachine(const clang::CompilerInstance& CI, unsigned Fmt = 0) {
default: OptLevel = CodeGenOpt::Default;
}
std::unique_ptr<TargetMachine> TM;
TM.reset(TheTarget->createTargetMachine(TheTriple.getTriple(),
MCPU, FeaturesStr,
Options,
Optional<Reloc::Model>(),
CMModel,
OptLevel));
return TM;
std::string MCPU;
std::string FeaturesStr;
return std::unique_ptr<TargetMachine>(TheTarget->createTargetMachine(Triple,
MCPU, FeaturesStr,
llvm::TargetOptions(),
Optional<Reloc::Model>(), CMModel,
OptLevel));
}
} // anonymous namespace
IncrementalExecutor::IncrementalExecutor(clang::DiagnosticsEngine& diags,
@ -105,8 +96,7 @@ IncrementalExecutor::IncrementalExecutor(clang::DiagnosticsEngine& diags,
// can use this object yet.
m_AtExitFuncs.reserve(256);
std::unique_ptr<TargetMachine>
TM(CreateHostTargetMachine(CI));
std::unique_ptr<TargetMachine> TM(CreateHostTargetMachine(CI));
m_BackendPasses.reset(new BackendPasses(CI.getCodeGenOpts(),
CI.getTargetOpts(),
CI.getLangOpts(),