diff options
| author | Amy Huang <akhuang@google.com> | 2019-05-02 20:07:35 +0000 |
|---|---|---|
| committer | Amy Huang <akhuang@google.com> | 2019-05-02 20:07:35 +0000 |
| commit | c1150d547616902e07d68c5b51f466bac8ff1883 (patch) | |
| tree | 4c83ce5327bbf41dae2972bf4ad00b378ec21f9c | |
| parent | 88767d874da80da9730a6610302dee8a559a4a7e (diff) | |
Change the metadata for heapallocsite calls when the type is cast.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@359823 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGCall.cpp | 1 | ||||
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 6 | ||||
| -rw-r--r-- | test/CodeGen/debug-info-codeview-heapallocsite.c | 28 |
3 files changed, 18 insertions, 17 deletions
diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp index ed58255231..b837fa486a 100644 --- a/lib/CodeGen/CGCall.cpp +++ b/lib/CodeGen/CGCall.cpp @@ -4370,7 +4370,6 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo, } // Add metadata for calls to MSAllocator functions - // FIXME: Get the type that the return value is cast to. if (getDebugInfo() && TargetDecl && TargetDecl->hasAttr<MSAllocatorAttr>()) getDebugInfo()->addHeapAllocSiteMetadata(CI, RetTy, Loc); diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 83e9349492..777e1dc893 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -2063,6 +2063,12 @@ Value *ScalarExprEmitter::VisitCastExpr(CastExpr *CE) { } } + // Update heapallocsite metadata when there is an explicit cast. + if (llvm::CallInst *CI = dyn_cast<llvm::CallInst>(Src)) + if (CI->getMetadata("heapallocsite") && isa<ExplicitCastExpr>(CE)) + CGF.getDebugInfo()-> + addHeapAllocSiteMetadata(CI, CE->getType(), CE->getExprLoc()); + return Builder.CreateBitCast(Src, DstTy); } case CK_AddressSpaceConversion: { diff --git a/test/CodeGen/debug-info-codeview-heapallocsite.c b/test/CodeGen/debug-info-codeview-heapallocsite.c index a0a7e3b71c..dfc0d19b25 100644 --- a/test/CodeGen/debug-info-codeview-heapallocsite.c +++ b/test/CodeGen/debug-info-codeview-heapallocsite.c @@ -1,27 +1,23 @@ // RUN: %clang_cc1 -triple x86_64-windows-msvc -debug-info-kind=limited -gcodeview -fdeclspec -S -emit-llvm < %s | FileCheck %s -struct Foo { - int x; -}; +struct Foo; +struct Bar; __declspec(allocator) void *alloc_void(); -__declspec(allocator) struct Foo *alloc_foo(); -void call_alloc_void() { - struct Foo *p = (struct Foo*)alloc_void(); +void call_alloc() { + struct Foo *p = alloc_void(); + struct Foo *q = (struct Foo*)alloc_void(); + struct Foo *r = (struct Foo*)(struct Bar*)alloc_void(); } -void call_alloc_foo() { - struct Foo *p = alloc_foo(); -} - -// CHECK-LABEL: define {{.*}}void @call_alloc_void +// CHECK-LABEL: define {{.*}}void @call_alloc // CHECK: call i8* {{.*}}@alloc_void{{.*}} !heapallocsite [[DBG1:!.*]] - -// CHECK-LABEL: define {{.*}}void @call_alloc_foo -// CHECK: call %struct.Foo* {{.*}}@alloc_foo{{.*}} !heapallocsite [[DBG2:!.*]] +// CHECK: call i8* {{.*}}@alloc_void{{.*}} !heapallocsite [[DBG2:!.*]] +// CHECK: call i8* {{.*}}@alloc_void{{.*}} !heapallocsite [[DBG3:!.*]] // CHECK: [[DBG1]] = !{} -// CHECK: [[DBG2]] = distinct !DICompositeType(tag: DW_TAG_structure_type, +// CHECK: [[DBG2]] = !DICompositeType(tag: DW_TAG_structure_type, // CHECK-SAME: name: "Foo" - +// CHECK: [[DBG3]] = !DICompositeType(tag: DW_TAG_structure_type, +// CHECK-SAME: name: "Bar" |