maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Reinstate -O3 for LTO. 

This broke in r144788 when the CodeGenOpt option was moved from everywhere else
(specifically, from addPassesToEmitFile) to createTargetMachine. Since
LTOCodeGenerator wasn't passing the 4th argument, when the 4th parameter became
the 3rd, it silently continued to compile (int->bool conversion) but meant
something completely different.

This change preserves the existing (accidental) and previous (default)
semantics of the addPassesToEmitFile and restores the previous/intended
CodeGenOpt argument by passing it appropriately to createTargetMachine.

(discovered by pending changes to -Wconversion to catch constant->bool
conversions)

llvm-svn: 157705
This commit is contained in:
David Blaikie 2012-05-30 18:42:51 +00:00
parent 406a2db1f6
commit 787705ae0d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/tools/lto/LTOCodeGenerator.cpp
View File

@ -240,7 +240,8 @@ bool LTOCodeGenerator::determineTarget(std::string& errMsg) {
std::string FeatureStr = Features.getString();
TargetOptions Options;
_target = march->createTargetMachine(Triple, _mCpu, FeatureStr, Options,
RelocModel);
RelocModel, CodeModel::Default,
CodeGenOpt::Aggressive);
}
return false;
}
@ -372,8 +373,7 @@ bool LTOCodeGenerator::generateObjectFile(raw_ostream &out,
formatted_raw_ostream Out(out);
if (_target->addPassesToEmitFile(*codeGenPasses, Out,
TargetMachine::CGFT_ObjectFile,
CodeGenOpt::Aggressive)) {
TargetMachine::CGFT_ObjectFile)) {
errMsg = "target file type not supported";
return true;
}