Author: akhuang Date: Thu May 2 13:07:35 2019 New Revision: 359823 URL: http://llvm.org/viewvc/llvm-project?rev=359823&view=rev Log: Change the metadata for heapallocsite calls when the type is cast.
Modified: cfe/trunk/lib/CodeGen/CGCall.cpp cfe/trunk/lib/CodeGen/CGExprScalar.cpp cfe/trunk/test/CodeGen/debug-info-codeview-heapallocsite.c Modified: cfe/trunk/lib/CodeGen/CGCall.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=359823&r1=359822&r2=359823&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGCall.cpp (original) +++ cfe/trunk/lib/CodeGen/CGCall.cpp Thu May 2 13:07:35 2019 @@ -4370,7 +4370,6 @@ RValue CodeGenFunction::EmitCall(const C } // 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); Modified: cfe/trunk/lib/CodeGen/CGExprScalar.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprScalar.cpp?rev=359823&r1=359822&r2=359823&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGExprScalar.cpp (original) +++ cfe/trunk/lib/CodeGen/CGExprScalar.cpp Thu May 2 13:07:35 2019 @@ -2063,6 +2063,12 @@ Value *ScalarExprEmitter::VisitCastExpr( } } + // 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: { Modified: cfe/trunk/test/CodeGen/debug-info-codeview-heapallocsite.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/debug-info-codeview-heapallocsite.c?rev=359823&r1=359822&r2=359823&view=diff ============================================================================== --- cfe/trunk/test/CodeGen/debug-info-codeview-heapallocsite.c (original) +++ cfe/trunk/test/CodeGen/debug-info-codeview-heapallocsite.c Thu May 2 13:07:35 2019 @@ -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" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits