Add helper pass to remove llvm.dbg.declare intrinsics.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66454 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 69 insertions, 2 deletions

diff --git a/include/llvm/Transforms/IPO.h b/include/llvm/Transforms/IPO.h
index eeb2aa26e8..4372ea00d4 100644
--- a/include/llvm/Transforms/IPO.h
+++ b/include/llvm/Transforms/IPO.h
@@ -35,12 +35,17 @@ ModulePass *createStripSymbolsPass(bool OnlyDebugInfo = false);
 
 //===----------------------------------------------------------------------===//
 //
-// These functions removes symbols from functions and modules.  
-// Only debugging information is not removed.
+// These functions strips symbols from functions and modules.  
+// Only debugging information is not stripped.
 //
 ModulePass *createStripNonDebugSymbolsPass();
 
 //===----------------------------------------------------------------------===//
+//
+// These pass removes llvm.dbg.declare intrinsics.
+ModulePass *createStripDebugDeclarePass();
+
+//===----------------------------------------------------------------------===//
 /// createLowerSetJmpPass - This function lowers the setjmp/longjmp intrinsics
 /// to invoke/unwind instructions.  This should really be part of the C/C++
 /// front-end, but it's so much easier to write transformations in LLVM proper.
diff --git a/lib/Transforms/IPO/StripSymbols.cpp b/lib/Transforms/IPO/StripSymbols.cpp
index fbb2075cb4..066487fe15 100644
--- a/lib/Transforms/IPO/StripSymbols.cpp
+++ b/lib/Transforms/IPO/StripSymbols.cpp
@@ -60,6 +60,19 @@ namespace {
       AU.setPreservesAll();
     }
   };
+
+  class VISIBILITY_HIDDEN StripDebugDeclare : public ModulePass {
+  public:
+    static char ID; // Pass identification, replacement for typeid
+    explicit StripDebugDeclare()
+      : ModulePass(&ID) {}
+
+    virtual bool runOnModule(Module &M);
+
+    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+      AU.setPreservesAll();
+    }
+  };
 }
 
 char StripSymbols::ID = 0;
@@ -78,6 +91,14 @@ ModulePass *llvm::createStripNonDebugSymbolsPass() {
   return new StripNonDebugSymbols();
 }
 
+char StripDebugDeclare::ID = 0;
+static RegisterPass<StripDebugDeclare>
+Z("strip-debug-declare", "Strip all llvm.dbg.declare intrinsics");
+
+ModulePass *llvm::createStripDebugDeclarePass() {
+  return new StripDebugDeclare();
+}
+
 /// OnlyUsedBy - Return true if V is only used by Usr.
 static bool OnlyUsedBy(Value *V, Value *Usr) {
   for(Value::use_iterator I = V->use_begin(), E = V->use_end(); I != E; ++I) {
@@ -343,3 +364,44 @@ bool StripSymbols::runOnModule(Module &M) {
 bool StripNonDebugSymbols::runOnModule(Module &M) {
   return StripSymbolNames(M, true);
 }
+
+bool StripDebugDeclare::runOnModule(Module &M) {
+
+  Function *Declare = M.getFunction("llvm.dbg.declare");
+
+  if (!Declare) 
+    return false;
+
+  std::vector<Constant*> DeadConstants;
+
+  while (!Declare->use_empty()) {
+    CallInst *CI = cast<CallInst>(Declare->use_back());
+    Value *Arg1 = CI->getOperand(1);
+    Value *Arg2 = CI->getOperand(2);
+    assert(CI->use_empty() && "llvm.dbg intrinsic should have void result");
+    CI->eraseFromParent();
+    if (Arg1->use_empty()) {
+      if (Constant *C = dyn_cast<Constant>(Arg1)) 
+        DeadConstants.push_back(C);
+      else 
+        RecursivelyDeleteTriviallyDeadInstructions(Arg1, NULL);
+    }
+    if (Arg2->use_empty())
+      if (Constant *C = dyn_cast<Constant>(Arg2)) 
+        DeadConstants.push_back(C);
+  }
+  Declare->eraseFromParent();
+
+  while (!DeadConstants.empty()) {
+    Constant *C = DeadConstants.back();
+    DeadConstants.pop_back();
+    if (GlobalVariable *GV = dyn_cast<GlobalVariable>(C)) {
+      if (GV->hasLocalLinkage())
+        RemoveDeadConstant(GV);
+    }
+    else
+      RemoveDeadConstant(C);
+  }
+
+  return true;
+}