From 0dda07ad4d14fb9a2466c18439dbf4edd0e84747 Mon Sep 17 00:00:00 2001
From: "Duncan P. N. Exon Smith" <dexonsmith@apple.com>
Date: Thu, 19 Mar 2015 21:37:17 +0000
Subject: [PATCH] PassManagerBuilder: Remove effectively dead 'StripDebug'
 option

`StripDebug` was only used by tools/opt/opt.cpp in
`AddStandardLinkPasses()`, but opt.cpp adds the same pass based on its
command-line flag before it calls `AddStandardLinkPasses()`.  Stripping
debug info twice isn't very useful.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@232765 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/Transforms/IPO/PassManagerBuilder.h | 1 -
 lib/Transforms/IPO/PassManagerBuilder.cpp        | 9 ++-------
 tools/opt/opt.cpp                                | 1 -
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/include/llvm/Transforms/IPO/PassManagerBuilder.h b/include/llvm/Transforms/IPO/PassManagerBuilder.h
index 65f471268dc..a34b6644ec6 100644
--- a/include/llvm/Transforms/IPO/PassManagerBuilder.h
+++ b/include/llvm/Transforms/IPO/PassManagerBuilder.h
@@ -120,7 +120,6 @@ public:
   bool DisableGVNLoadPRE;
   bool VerifyInput;
   bool VerifyOutput;
-  bool StripDebug;
   bool MergeFunctions;
 
 private:
diff --git a/lib/Transforms/IPO/PassManagerBuilder.cpp b/lib/Transforms/IPO/PassManagerBuilder.cpp
index 5928eb1d9c3..8c1e039484b 100644
--- a/lib/Transforms/IPO/PassManagerBuilder.cpp
+++ b/lib/Transforms/IPO/PassManagerBuilder.cpp
@@ -97,7 +97,6 @@ PassManagerBuilder::PassManagerBuilder() {
     DisableGVNLoadPRE = false;
     VerifyInput = false;
     VerifyOutput = false;
-    StripDebug = false;
     MergeFunctions = false;
 }
 
@@ -512,14 +511,10 @@ void PassManagerBuilder::populateLTOPassManager(legacy::PassManagerBase &PM) {
   if (LibraryInfo)
     PM.add(new TargetLibraryInfoWrapperPass(*LibraryInfo));
 
-  if (VerifyInput)
+  if (VerifyInput) {
     PM.add(createVerifierPass());
-
-  if (StripDebug)
-    PM.add(createStripSymbolsPass(true));
-
-  if (VerifyInput)
     PM.add(createDebugInfoVerifierPass());
+  }
 
   if (OptLevel != 0)
     addLTOOptimizationPasses(PM);
diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp
index ce057da6cea..6c27c1ecbbf 100644
--- a/tools/opt/opt.cpp
+++ b/tools/opt/opt.cpp
@@ -234,7 +234,6 @@ static void AddOptimizationPasses(legacy::PassManagerBase &MPM,
 static void AddStandardLinkPasses(legacy::PassManagerBase &PM) {
   PassManagerBuilder Builder;
   Builder.VerifyInput = true;
-  Builder.StripDebug = StripDebug;
   if (DisableOptimizations)
     Builder.OptLevel = 0;