r181958 - Set the debug location for landing pad code to the canonical EH location.

[Adrian Prantl]

Author: adrian
Date: Wed May 15 19:41:29 2013
New Revision: 181958

URL: http://llvm.org/viewvc/llvm-project?rev=181958&view=rev
Log:
Set the debug location for landing pad code to the canonical EH location.
It used to point to the first call that caused the landing pad to
be generated.

rdar://problem/13888152

Added:
    cfe/trunk/test/CodeGenCXX/lpad-linetable.cpp
Modified:
    cfe/trunk/lib/CodeGen/CGDebugInfo.h
    cfe/trunk/lib/CodeGen/CGException.cpp

Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.h?rev=181958&r1=181957&r2=181958&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDebugInfo.h (original)
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.h Wed May 15 19:41:29 2013
@@ -206,6 +206,9 @@ public:
   /// invalid it is ignored.
   void setLocation(SourceLocation Loc);
 
+  /// getLocation - Return the current source location.
+  SourceLocation getLocation() const { return CurLoc; }
+
   /// EmitLocation - Emit metadata to indicate a change in line/column
   /// information in the source file.
   /// \param ForceColumnInfo  Assume DebugColumnInfo option is true.

Modified: cfe/trunk/lib/CodeGen/CGException.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGException.cpp?rev=181958&r1=181957&r2=181958&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGException.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGException.cpp Wed May 15 19:41:29 2013
@@ -766,6 +766,11 @@ llvm::BasicBlock *CodeGenFunction::EmitL
 
   // Save the current IR generation state.
   CGBuilderTy::InsertPoint savedIP = Builder.saveAndClearIP();
+  SourceLocation SavedLocation;
+  if (CGDebugInfo *DI = getDebugInfo()) {
+    SavedLocation = DI->getLocation();
+    DI->EmitLocation(Builder, CurEHLocation);
+  }
 
   const EHPersonality &personality = EHPersonality::get(getLangOpts());
 
@@ -887,6 +892,8 @@ llvm::BasicBlock *CodeGenFunction::EmitL
 
   // Restore the old IR generation state.
   Builder.restoreIP(savedIP);
+  if (CGDebugInfo *DI = getDebugInfo())
+    DI->EmitLocation(Builder, SavedLocation);
 
   return lpad;
 }

Added: cfe/trunk/test/CodeGenCXX/lpad-linetable.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/lpad-linetable.cpp?rev=181958&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/lpad-linetable.cpp (added)
+++ cfe/trunk/test/CodeGenCXX/lpad-linetable.cpp Wed May 15 19:41:29 2013
@@ -0,0 +1,69 @@
+// RUN: %clang_cc1  -fcxx-exceptions -fexceptions -emit-llvm -g -triple x86_64-apple-darwin10 %s -o - | FileCheck %s
+// The landing pad should have the line number of the closing brace of the function.
+// rdar://problem/13888152
+// CHECK: ret i32
+// CHECK: landingpad {{.*}}
+// CHECK-NEXT: !dbg ![[LPAD:[0-9]+]]
+// CHECK: ![[LPAD]] = metadata !{i32 24, i32 0, metadata !{{.*}}, null}
+
+# 1 "/usr/include/c++/4.2.1/vector" 1 3
+typedef long unsigned int __darwin_size_t;
+typedef __darwin_size_t size_t;
+namespace std {
+  template<typename _Tp>
+  class allocator
+  {
+  public:
+    template<typename _Tp1>
+    struct rebind
+    { typedef allocator<_Tp1> other; };
+    ~allocator() throw() { }
+  };
+  template<typename _Tp, typename _Alloc>
+  struct _Vector_base
+  {
+    typedef typename _Alloc::template rebind<_Tp>::other _Tp_alloc_type;
+    struct _Vector_impl
+    {
+      _Vector_impl(_Tp_alloc_type const& __a)      { }
+    };
+    typedef _Alloc allocator_type;
+    _Vector_base(const allocator_type& __a)
+    : _M_impl(__a)
+    {  }
+    ~_Vector_base()  {  }
+    _Vector_impl _M_impl;
+  };
+  template<typename _Tp, typename _Alloc = std::allocator<_Tp> >
+  class vector
+    : protected _Vector_base<_Tp, _Alloc>
+  {
+    typedef _Vector_base<_Tp, _Alloc> _Base;
+  public:
+    typedef _Tp value_type;
+    typedef size_t size_type;
+    typedef _Alloc allocator_type;
+    vector(const allocator_type& __a = allocator_type())
+      : _Base(__a)
+    {      }
+    size_type
+    push_back(const value_type& __x)
+    {}
+  };
+}
+# 10 "main.cpp" 2
+
+
+
+
+int main (int argc, char const *argv[], char const *envp[])
+{ // 15
+  std::vector<long> longs;
+  std::vector<short> shorts;
+  for (int i=0; i<12; i++)
+    {
+      longs.push_back(i);
+      shorts.push_back(i);
+    }
+  return 0; // 23
+} // 24