diff --git a/llvm/lib/Transforms/Scalar/BDCE.cpp b/llvm/lib/Transforms/Scalar/BDCE.cpp index 7ae1666f4cbb0..c06125788f37e 100644 --- a/llvm/lib/Transforms/Scalar/BDCE.cpp +++ b/llvm/lib/Transforms/Scalar/BDCE.cpp @@ -93,7 +93,7 @@ static void clearAssumptionsOfUsers(Instruction *I, DemandedBits &DB) { static bool bitTrackingDCE(Function &F, DemandedBits &DB) { SmallVector Worklist; bool Changed = false; - for (Instruction &I : llvm::reverse(instructions(F))) { + for (Instruction &I : instructions(F)) { // If the instruction has side effects and no non-dbg uses, // skip it. This way we avoid computing known bits on an instruction // that will not help us. @@ -108,6 +108,7 @@ static bool bitTrackingDCE(Function &F, DemandedBits &DB) { wouldInstructionBeTriviallyDead(&I))) { salvageDebugInfo(I); Worklist.push_back(&I); + I.dropAllReferences(); Changed = true; continue; } @@ -154,9 +155,6 @@ static bool bitTrackingDCE(Function &F, DemandedBits &DB) { } } - for (Instruction *&I : Worklist) - I->dropAllReferences(); - for (Instruction *&I : Worklist) { ++NumRemoved; I->eraseFromParent(); diff --git a/llvm/test/Transforms/Util/salvage-debuginfo.ll b/llvm/test/Transforms/Util/salvage-debuginfo.ll index d72b239e31644..ed1baa56017af 100644 --- a/llvm/test/Transforms/Util/salvage-debuginfo.ll +++ b/llvm/test/Transforms/Util/salvage-debuginfo.ll @@ -1,5 +1,4 @@ ; RUN: opt -adce %s -S -o - | FileCheck %s -; RUN: opt -bdce %s -S -o - | FileCheck %s target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx" define void @f(i32) !dbg !8 {