From 746edea0ae359b888e272e6209602e9e86575794 Mon Sep 17 00:00:00 2001 From: Paul Robinson Date: Mon, 20 Nov 2017 19:07:52 +0000 Subject: Revert "Fix out-of-order stepping behavior in programs with sunk instructions." This reverts commit 30419e150cd940893a13b345e85f96053850208f. aka r318679. It caused "sanitizer-windows" bot to fail. llvm-svn: 318684 --- llvm/lib/CodeGen/MachineSink.cpp | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'llvm/lib/CodeGen/MachineSink.cpp') diff --git a/llvm/lib/CodeGen/MachineSink.cpp b/llvm/lib/CodeGen/MachineSink.cpp index 262d3db22e5..6f3753e88b8 100644 --- a/llvm/lib/CodeGen/MachineSink.cpp +++ b/llvm/lib/CodeGen/MachineSink.cpp @@ -38,7 +38,6 @@ #include "llvm/CodeGen/TargetSubtargetInfo.h" #include "llvm/IR/BasicBlock.h" #include "llvm/IR/LLVMContext.h" -#include "llvm/IR/DebugInfoMetadata.h" #include "llvm/Pass.h" #include "llvm/Support/BranchProbability.h" #include "llvm/Support/CommandLine.h" @@ -869,16 +868,6 @@ bool MachineSinking::SinkInstruction(MachineInstr &MI, bool &SawStore, SmallVector DbgValuesToSink; collectDebugValues(MI, DbgValuesToSink); - // Merge or erase debug location to ensure consistent stepping in profilers - // and debuggers. - if (!SuccToSinkTo->empty()) { - MI.setDebugLoc(DILocation::getMergedLocation(MI.getDebugLoc(), - InsertPos->getDebugLoc())); - } else { - MI.setDebugLoc(DebugLoc()); - } - - // Move the instruction. SuccToSinkTo->splice(InsertPos, ParentBlock, MI, ++MachineBasicBlock::iterator(MI)); -- cgit v1.2.3