From bc5dfed59cdd9741ee7f80427cb144e46b79452c Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Sun, 14 Dec 2014 18:48:18 +0000 Subject: [PATCH] DebugInfo: More accurate line information for placement new. This actually came up as a break in UBSan tests (look for a follow-up commit to this one to see the UBSan test fallout) when I tried a broader fix to location information. I have some other ideas about how to do that broader change & will keep looking into it. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@224221 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGExprCXX.cpp | 3 +++ test/CodeGenCXX/debug-info-line.cpp | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/CodeGen/CGExprCXX.cpp b/lib/CodeGen/CGExprCXX.cpp index 65e4b2df0d..31f9141eeb 100644 --- a/lib/CodeGen/CGExprCXX.cpp +++ b/lib/CodeGen/CGExprCXX.cpp @@ -1269,6 +1269,9 @@ llvm::Value *CodeGenFunction::EmitCXXNewExpr(const CXXNewExpr *E) { E->placement_arg_end(), /* CalleeDecl */ nullptr, /*ParamsToSkip*/ 1); + if (auto *DI = getDebugInfo()) + DI->EmitLocation(Builder, E->getLocStart()); + // Emit the allocation call. If the allocator is a global placement // operator, just "inline" it directly. RValue RV; diff --git a/test/CodeGenCXX/debug-info-line.cpp b/test/CodeGenCXX/debug-info-line.cpp index f855c47cad..6694a732c5 100644 --- a/test/CodeGenCXX/debug-info-line.cpp +++ b/test/CodeGenCXX/debug-info-line.cpp @@ -99,12 +99,13 @@ void f9(int i) { src1)[src2()]; } -void *operator new(decltype(sizeof(1)), void *); +inline void *operator new(decltype(sizeof(1)), void *p) noexcept { return p; } // CHECK-LABEL: define void f10() { void *void_src(); - ( // CHECK: store {{.*}} !dbg [[DBG_F10:!.*]] + ( // CHECK: icmp {{.*}} !dbg [[DBG_F10_ICMP:.*]] + // CHECK: store {{.*}} !dbg [[DBG_F10_STORE:!.*]] #line 1100 new (void_src()) int(src())); } @@ -121,4 +122,5 @@ void f10() { // CHECK: [[DBG_F7]] = metadata !{i32 800, // CHECK: [[DBG_F8]] = metadata !{i32 900, // CHECK: [[DBG_F9]] = metadata !{i32 1000, -// CHECK: [[DBG_F10]] = metadata !{i32 1100, +// CHECK: [[DBG_F10_ICMP]] = metadata !{i32 1100, +// CHECK: [[DBG_F10_STORE]] = metadata !{i32 1100, -- 2.50.1