[llvm-commits] [llvm-gcc-4.2] r66933 - in /llvm-gcc-4.2/branches/Apple/Dib/gcc: llvm-convert.cpp llvm-debug.cpp llvm-debug.h

[Bill Wendling]

Author: void
Date: Fri Mar 13 15:23:40 2009
New Revision: 66933

URL: http://llvm.org/viewvc/llvm-project?rev=66933&view=rev
Log:
--- Merging (from foreign repository) r66743 into '.':
U    gcc/llvm-debug.cpp
U    gcc/llvm-debug.h

--- Merging (from foreign repository) r66802 into '.':
U    gcc/llvm-convert.cpp
G    gcc/llvm-debug.cpp
G    gcc/llvm-debug.h

Modified:
    llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp
    llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.cpp
    llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.h

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp?rev=66933&r1=66932&r2=66933&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp Fri Mar 13 15:23:40 2009
@@ -850,7 +850,10 @@
       }
     }
   }
-  if (TheDebugInfo) TheDebugInfo->EmitRegionEnd(Fn, Builder.GetInsertBlock());
+  if (TheDebugInfo) {
+    TheDebugInfo->EmitStopPoint(Fn, Builder.GetInsertBlock());
+    TheDebugInfo->EmitRegionEnd(Builder.GetInsertBlock());
+  }
   if (RetVals.empty())
     Builder.CreateRetVoid();
   else if (!Fn->getReturnType()->isAggregateType()) {

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.cpp?rev=66933&r1=66932&r2=66933&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.cpp Fri Mar 13 15:23:40 2009
@@ -262,7 +262,7 @@
 
 /// EmitRegionStart- Constructs the debug code for entering a declarative
 /// region - "llvm.dbg.region.start."
-void DebugInfo::EmitRegionStart(Function *Fn, BasicBlock *CurBB) {
+void DebugInfo::EmitRegionStart(BasicBlock *CurBB) {
   llvm::DIDescriptor D;
   if (!RegionStack.empty())
     D = RegionStack.back();
@@ -273,13 +273,8 @@
 
 /// EmitRegionEnd - Constructs the debug code for exiting a declarative
 /// region - "llvm.dbg.region.end."
-void DebugInfo::EmitRegionEnd(Function *Fn, BasicBlock *CurBB) {
-
+void DebugInfo::EmitRegionEnd(BasicBlock *CurBB) {
   assert(!RegionStack.empty() && "Region stack mismatch, stack empty!");
-
-  // Provide an region stop point.
-  EmitStopPoint(Fn, CurBB);
-  
   DebugFactory.InsertRegionEnd(RegionStack.back(), CurBB);
   RegionStack.pop_back();
 }

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.h?rev=66933&r1=66932&r2=66933&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.h (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.h Fri Mar 13 15:23:40 2009
@@ -91,11 +91,11 @@
 
   /// EmitRegionStart- Constructs the debug code for entering a declarative
   /// region - "llvm.dbg.region.start."
-  void EmitRegionStart(Function *Fn, BasicBlock *CurBB);
+  void EmitRegionStart(BasicBlock *CurBB);
 
   /// EmitRegionEnd - Constructs the debug code for exiting a declarative
   /// region - "llvm.dbg.region.end."
-  void EmitRegionEnd(Function *Fn, BasicBlock *CurBB);
+  void EmitRegionEnd(BasicBlock *CurBB);
 
   /// EmitDeclare - Constructs the debug code for allocation of a new variable.
   /// region - "llvm.dbg.declare."