Fix PR2231 - opt -internalize -std-compile-opts should run internalize first
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@53523 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp
index 19dcb2b..08acbe8 100644
--- a/tools/opt/opt.cpp
+++ b/tools/opt/opt.cpp
@@ -379,18 +379,21 @@
// Add an appropriate TargetData instance for this module...
Passes.add(new TargetData(M.get()));
- // If -std-compile-opts is given, add in all the standard compilation
- // optimizations first. This will handle -strip-debug, -disable-inline,
- // and -disable-opt as well.
- if (StandardCompileOpts)
- AddStandardCompilePasses(Passes);
-
- // otherwise if the -strip-debug command line option was specified, add it.
- else if (StripDebug)
+ // If the -strip-debug command line option was specified, add it. If
+ // -std-compile-opts was also specified, it will handle StripDebug.
+ if (StripDebug && !StandardCompileOpts)
addPass(Passes, createStripSymbolsPass(true));
// Create a new optimization pass for each one specified on the command line
for (unsigned i = 0; i < PassList.size(); ++i) {
+ // Check to see if -std-compile-opts we specified before this option. If
+ // so, handle it.
+ if (StandardCompileOpts &&
+ StandardCompileOpts.getPosition() < PassList.getPosition(i)) {
+ AddStandardCompilePasses(Passes);
+ StandardCompileOpts = false;
+ }
+
const PassInfo *PassInf = PassList[i];
Pass *P = 0;
if (PassInf->getNormalCtor())
@@ -418,6 +421,12 @@
if (PrintEachXForm)
Passes.add(new PrintModulePass(&cerr));
}
+
+ // If -std-compile-opts was specified at the end of the pass list, add them.
+ if (StandardCompileOpts) {
+ AddStandardCompilePasses(Passes);
+ StandardCompileOpts = false;
+ }
// Check that the module is well formed on completion of optimization
if (!NoVerify && !VerifyEach)