Refine further the scope where the global DebugLoc value is active.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@101443 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 7a4a4f9..c38c8e9 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -256,15 +256,13 @@
SDB->setCurrentBasicBlock(BB);
// Lower all of the non-terminator instructions. If a call is emitted
- // as a tail call, cease emitting nodes for this block.
+ // as a tail call, cease emitting nodes for this block. Terminators
+ // are handled below.
for (BasicBlock::const_iterator I = Begin;
- I != End && !SDB->HasTailCall; ++I) {
+ I != End && !SDB->HasTailCall && !isa<TerminatorInst>(I);
+ ++I) {
SetDebugLoc(I, SDB, 0, MF);
-
- // Visit the instruction. Terminators are handled below.
- if (!isa<TerminatorInst>(I))
- SDB->visit(*I);
-
+ SDB->visit(*I);
ResetDebugLoc(SDB, 0);
}