Revert r133953 for now.

llvm-svn: 134116

2 files changed, 0 insertions, 24 deletions

diff --git a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
index 580239af99f..ea7feade60d 100644
--- a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
@@ -292,28 +292,6 @@ void FastISel::recomputeInsertPt() {
     ++FuncInfo.InsertPt;
 }
 
-/// recomputeDebugLocForMaterializedRegs - Recompute debug location for
-/// very first instruction in a basic block. All instructions emitted
-/// to materialize registers do not have location information, see
-/// enterLocalValueArea(), becase they may not be emited at the right
-/// location.
-void FastISel::recomputeDebugLocForMaterializedRegs() {
-  if (!getLastLocalValue())
-    return;
-  MachineInstr *First = FuncInfo.MBB->getFirstNonPHI();
-  if (!First->getDebugLoc().isUnknown())
-    return;
-
-  for (MachineBasicBlock::iterator I = FuncInfo.MBB->begin(),
-         E = FuncInfo.MBB->end(); I != E; ++I) {
-    DebugLoc DL = I->getDebugLoc();
-    if (!DL.isUnknown()) {
-      First->setDebugLoc(DL);
-      return;
-    }
-  }
-}
-
 FastISel::SavePoint FastISel::enterLocalValueArea() {
   MachineBasicBlock::iterator OldInsertPt = FuncInfo.InsertPt;
   DebugLoc OldDL = DL;
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 8cdc63d6bcf..87bb296b8c7 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -964,8 +964,6 @@ void SelectionDAGISel::SelectAllBasicBlocks(const Function &Fn) {
     else
       ++NumFastIselBlocks;
 
-    if (FastIS)
-      FastIS->recomputeDebugLocForMaterializedRegs();
     if (Begin != BI) {
       // Run SelectionDAG instruction selection on the remainder of the block
       // not handled by FastISel. If FastISel is not run, this is the entire