From 4658ea9dc72af30210268fb7d9045bfd48be1d30 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 21 Aug 2014 18:49:52 +0000 Subject: [PATCH] Respect LibraryInfo in populateLTOPassManager and use it. NFC. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216203 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/LTO/LTOCodeGenerator.cpp | 5 ++--- lib/Transforms/IPO/PassManagerBuilder.cpp | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/LTO/LTOCodeGenerator.cpp b/lib/LTO/LTOCodeGenerator.cpp index 1fdc5cf04dd..80aa48e0fbc 100644 --- a/lib/LTO/LTOCodeGenerator.cpp +++ b/lib/LTO/LTOCodeGenerator.cpp @@ -466,11 +466,9 @@ bool LTOCodeGenerator::generateObjectFile(raw_ostream &out, mergedModule->setDataLayout(TargetMach->getSubtargetImpl()->getDataLayout()); passes.add(new DataLayoutPass(mergedModule)); - // Add appropriate TargetLibraryInfo for this module. - passes.add(new TargetLibraryInfo(Triple(TargetMach->getTargetTriple()))); - TargetMach->addAnalysisPasses(passes); + Triple TargetTriple(TargetMach->getTargetTriple()); // Enabling internalize here would use its AllButMain variant. It // keeps only main if it exists and does nothing for libraries. Instead // we create the pass ourselves with the symbol list provided by the linker. @@ -479,6 +477,7 @@ bool LTOCodeGenerator::generateObjectFile(raw_ostream &out, PMB.DisableGVNLoadPRE = DisableGVNLoadPRE; if (!DisableInline) PMB.Inliner = createFunctionInliningPass(); + PMB.LibraryInfo = new TargetLibraryInfo(TargetTriple); PMB.populateLTOPassManager(passes); } diff --git a/lib/Transforms/IPO/PassManagerBuilder.cpp b/lib/Transforms/IPO/PassManagerBuilder.cpp index 07f46883600..b76f3486e5f 100644 --- a/lib/Transforms/IPO/PassManagerBuilder.cpp +++ b/lib/Transforms/IPO/PassManagerBuilder.cpp @@ -314,6 +314,10 @@ void PassManagerBuilder::populateModulePassManager(PassManagerBase &MPM) { } void PassManagerBuilder::populateLTOPassManager(PassManagerBase &PM) { + // Add LibraryInfo if we have some. + if (LibraryInfo) + PM.add(new TargetLibraryInfo(*LibraryInfo)); + // Provide AliasAnalysis services for optimizations. addInitialAliasAnalysisPasses(PM); -- 2.34.1