Revert "Reapply "LTO: add API to set strategy for -internalize""

This reverts commit r199244.

Conflicts:
	include/llvm-c/lto.h
	include/llvm/LTO/LTOCodeGenerator.h
	lib/LTO/LTOCodeGenerator.cpp

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205471 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith
2014-04-02 22:05:57 +00:00
parent 172e0ca8c5
commit 3845c071a7
6 changed files with 17 additions and 86 deletions

View File

@ -65,8 +65,7 @@ const char* LTOCodeGenerator::getVersionString() {
LTOCodeGenerator::LTOCodeGenerator()
: Context(getGlobalContext()), Linker(new Module("ld-temp.o", Context)),
TargetMach(NULL), EmitDwarfDebugInfo(false), ScopeRestrictionsDone(false),
CodeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC),
InternalizeStrategy(LTO_INTERNALIZE_FULL), NativeObjectFile(NULL),
CodeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC), NativeObjectFile(NULL),
DiagHandler(NULL), DiagContext(NULL) {
initializeLTOPasses();
}
@ -169,18 +168,6 @@ void LTOCodeGenerator::setCodePICModel(lto_codegen_model model) {
llvm_unreachable("Unknown PIC model!");
}
void
LTOCodeGenerator::setInternalizeStrategy(lto_internalize_strategy Strategy) {
switch (Strategy) {
case LTO_INTERNALIZE_FULL:
case LTO_INTERNALIZE_NONE:
case LTO_INTERNALIZE_HIDDEN:
InternalizeStrategy = Strategy;
return;
}
llvm_unreachable("Unknown internalize strategy!");
}
bool LTOCodeGenerator::writeMergedModules(const char *path,
std::string &errMsg) {
if (!determineTarget(errMsg))
@ -402,7 +389,7 @@ static void accumulateAndSortLibcalls(std::vector<StringRef> &Libcalls,
}
void LTOCodeGenerator::applyScopeRestrictions() {
if (ScopeRestrictionsDone || !shouldInternalize())
if (ScopeRestrictionsDone)
return;
Module *mergedModule = Linker.getModule();
@ -454,8 +441,7 @@ void LTOCodeGenerator::applyScopeRestrictions() {
LLVMCompilerUsed->setSection("llvm.metadata");
}
passes.add(
createInternalizePass(MustPreserveList, shouldOnlyInternalizeHidden()));
passes.add(createInternalizePass(MustPreserveList));
// apply scope restrictions
passes.run(*mergedModule);