Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-24 14:20:17 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "Reland D80966 [codeview] Put !heapallocsite on calls to operator new"

Browse Source 
This reverts commit b6e143aa54.

Causes https://bugs.chromium.org/p/chromium/issues/detail?id=1092370#c5.
Will investigate and reland (again).
This commit is contained in:
Arthur Eubanks 2020-06-08 12:48:03 -07:00
parent 8e1d204344
commit a92ce3b706
7 changed files with 16 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/CodeGen/CGCall.cpp
View File

@ -4951,7 +4951,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
// Add metadata for calls to MSAllocator functions
if (getDebugInfo() && TargetDecl &&
TargetDecl->hasAttr<MSAllocatorAttr>())
getDebugInfo()->addHeapAllocSiteMetadata(CI, RetTy->getPointeeType(), Loc);
getDebugInfo()->addHeapAllocSiteMetadata(CI, RetTy, Loc);
// 4. Finish the call.

12
clang/lib/CodeGen/CGDebugInfo.cpp
View File

@ -2146,14 +2146,16 @@ llvm::DIType *CGDebugInfo::getOrCreateStandaloneType(QualType D,
return T;
}
void CGDebugInfo::addHeapAllocSiteMetadata(llvm::CallBase *CI,
QualType AllocatedTy,
void CGDebugInfo::addHeapAllocSiteMetadata(llvm::Instruction *CI,
QualType D,
SourceLocation Loc) {
llvm::MDNode *node;
if (AllocatedTy->isVoidType())
if (D.getTypePtr()->isVoidPointerType()) {
node = llvm::MDNode::get(CGM.getLLVMContext(), None);
else
node = getOrCreateType(AllocatedTy, getOrCreateFile(Loc));
} else {
QualType PointeeTy = D.getTypePtr()->getPointeeType();
node = getOrCreateType(PointeeTy, getOrCreateFile(Loc));
}
CI->setMetadata("heapallocsite", node);
}

2
clang/lib/CodeGen/CGDebugInfo.h
View File

@ -509,7 +509,7 @@ public:
llvm::DIType *getOrCreateStandaloneType(QualType Ty, SourceLocation Loc);
/// Add heapallocsite metadata for MSAllocator calls.
void addHeapAllocSiteMetadata(llvm::CallBase *CallSite, QualType AllocatedTy,
void addHeapAllocSiteMetadata(llvm::Instruction *CallSite, QualType Ty,
SourceLocation Loc);
void completeType(const EnumDecl *ED);

6
clang/lib/CodeGen/CGExprCXX.cpp
View File

@ -1638,12 +1638,6 @@ llvm::Value *CodeGenFunction::EmitCXXNewExpr(const CXXNewExpr *E) {
RValue RV =
EmitNewDeleteCall(*this, allocator, allocatorType, allocatorArgs);
// Set !heapallocsite metadata on the call to operator new.
if (CGM.getCodeGenOpts().getDebugInfo() != codegenoptions::NoDebugInfo)
if (auto *newCall = dyn_cast<llvm::CallBase>(RV.getScalarVal()))
getDebugInfo()->addHeapAllocSiteMetadata(newCall, allocType,
E->getExprLoc());
// If this was a call to a global replaceable allocation function that does
// not take an alignment argument, the allocator is known to produce
// storage that's suitably aligned for any object that fits, up to a known

14
clang/lib/CodeGen/CGExprScalar.cpp
View File

@ -2081,15 +2081,11 @@ Value *ScalarExprEmitter::VisitCastExpr(CastExpr *CE) {
}
}
// Update heapallocsite metadata when there is an explicit pointer cast.
if (auto *CI = dyn_cast<llvm::CallBase>(Src)) {
if (CI->getMetadata("heapallocsite") && isa<ExplicitCastExpr>(CE)) {
QualType PointeeType = DestTy->getPointeeType();
if (!PointeeType.isNull())
CGF.getDebugInfo()->addHeapAllocSiteMetadata(CI, PointeeType,
CE->getExprLoc());
}
}
// 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);
}

7
clang/test/CodeGen/debug-info-codeview-heapallocsite.c
View File

@ -1,22 +1,19 @@
// RUN: %clang_cc1 -triple x86_64-windows-msvc -debug-info-kind=limited -gcodeview -fdeclspec -S -emit-llvm %s -o - | FileCheck %s
// RUN: %clang_cc1 -triple x86_64-windows-msvc -debug-info-kind=limited -gcodeview -fdeclspec -S -emit-llvm < %s | FileCheck %s
struct Foo;
struct Bar;
__declspec(allocator) void *alloc_void();
__declspec(allocator) struct Foo *alloc_foo();
void call_alloc() {
struct Foo *p = alloc_void();
struct Foo *w = alloc_foo();
struct Foo *q = (struct Foo*)alloc_void();
struct Foo *r = (struct Foo*)(struct Bar*)alloc_void();
}
// CHECK-LABEL: define {{.*}}void @call_alloc
// CHECK: call i8* {{.*}}@alloc_void{{.*}} !heapallocsite [[DBG1:!.*]]
// CHECK: call %struct.Foo* {{.*}}@alloc_foo{{.*}} !heapallocsite [[DBG2:!.*]]
// CHECK: call i8* {{.*}}@alloc_void{{.*}} !heapallocsite [[DBG2]]
// CHECK: call i8* {{.*}}@alloc_void{{.*}} !heapallocsite [[DBG2:!.*]]
// CHECK: call i8* {{.*}}@alloc_void{{.*}} !heapallocsite [[DBG3:!.*]]
// CHECK: [[DBG1]] = !{}

34
clang/test/CodeGenCXX/debug-info-codeview-heapallocsite.cpp
View File

@ -1,34 +0,0 @@
// RUN: %clang_cc1 -fexceptions -triple x86_64-windows-msvc -debug-info-kind=limited -gcodeview -fdeclspec -S -emit-llvm %s -o - | FileCheck %s
struct Foo {
int x;
};
struct Bar {
int y;
};
extern Foo *gv_foo;
extern Bar *gv_bar;
extern "C" void doit() {
gv_foo = new Foo();
gv_bar = new Bar();
}
// CHECK-LABEL: define {{.*}}void @doit
// CHECK: call {{.*}} i8* {{.*}}@"??2@YAPEAX_K@Z"(i64 4) {{.*}} !heapallocsite [[DBG_FOO:!.*]]
// CHECK: call {{.*}} i8* {{.*}}@"??2@YAPEAX_K@Z"(i64 4) {{.*}} !heapallocsite [[DBG_BAR:!.*]]
extern "C" void useinvoke() {
struct HasDtor {
~HasDtor() { delete gv_foo; }
} o;
gv_foo = new Foo();
}
// CHECK-LABEL: define {{.*}}void @useinvoke
// CHECK: invoke {{.*}} i8* {{.*}}@"??2@YAPEAX_K@Z"(i64 4)
// CHECK-NEXT: to label {{.*}} unwind label {{.*}} !heapallocsite [[DBG_FOO]]
// CHECK: [[DBG_FOO]] = distinct !DICompositeType(tag: DW_TAG_structure_type,
// CHECK-SAME: name: "Foo"
// CHECK: [[DBG_BAR]] = distinct !DICompositeType(tag: DW_TAG_structure_type,
// CHECK-SAME: name: "Bar"