[llvm-branch-commits] [llvm-gcc-branch] r100255 - /llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp

[Devang Patel]

Author: dpatel
Date: Fri Apr  2 19:24:28 2010
New Revision: 100255

URL: http://llvm.org/viewvc/llvm-project?rev=100255&view=rev
Log:
Merge Chris's DebugLoc changes from mainline.

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp?rev=100255&r1=100254&r2=100255&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp Fri Apr  2 19:24:28 2010
@@ -470,12 +470,8 @@
   // Insert an llvm.dbg.declare into the current block.
   Instruction *Call = DebugFactory.InsertDeclare(AI, D, 
                                                  Builder.GetInsertBlock());
-
-  llvm::DILocation DO(NULL);
-  llvm::DILocation DL = 
-    DebugFactory.CreateLocation(CurLineNo, 0 /* column */, VarScope, DO);
   
-  Call->setDbgMetadata(DL.getNode());
+  Call->setDebugLoc(DebugLoc::get(CurLineNo, 0, VarScope.getNode()));
 }
 
 
@@ -524,12 +520,8 @@
     
     if (RegionStack.empty())
       return;
-    llvm::DIDescriptor DR(cast<MDNode>(RegionStack.back()));
-    llvm::DIScope DS = llvm::DIScope(DR.getNode());
-    llvm::DILocation DO(NULL);
-    llvm::DILocation DL = 
-      DebugFactory.CreateLocation(CurLineNo, 0 /* column */, DS, DO);
-    Builder.SetCurrentDebugLocation(DL.getNode());
+    MDNode *Scope = cast<MDNode>(RegionStack.back());
+    Builder.SetCurrentDebugLocation(DebugLoc::get(CurLineNo,0/*col*/,Scope));
   }
 }