This is an archive of the discontinued LLVM Phabricator instance.

Differential D81481

Change debuginfo check for addHeapAllocSiteMetadata
ClosedPublic

Authored by aeubanks on Jun 9 2020, 9:57 AM.

Details

Reviewers
akhuang
Commits
rGbc38793852c0: Change debuginfo check for addHeapAllocSiteMetadata
Summary

Move check inside of addHeapAllocSiteMetadata().
Change check to DebugInfo <= DebugLineTablesOnly.

Diff Detail

Event Timeline

aeubanks created this revision.Jun 9 2020, 9:57 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 9 2020, 9:57 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
akhuang accepted this revision.Jun 9 2020, 10:31 AM

lgtm, thanks!

This revision is now accepted and ready to land.Jun 9 2020, 10:31 AM
Closed by commit rGbc38793852c0: Change debuginfo check for addHeapAllocSiteMetadata (authored by aeubanks). · Explain WhyJun 9 2020, 11:33 AM
This revision was automatically updated to reflect the committed changes.
Harbormaster completed remote builds in B59654: Diff 269580.Jun 9 2020, 12:40 PM

Revision Contents

PathSize
clang/
lib/
CodeGen/
3 lines
3 lines

Diff 269621

clang/lib/CodeGen/CGDebugInfo.cpp

Show First 20 Lines • Show All 2,143 Lines • ▼ Show 20 Linesllvm::DIType *CGDebugInfo::getOrCreateStandaloneType(QualType D,
RetainedTypes.push_back(D.getAsOpaquePtr()); RetainedTypes.push_back(D.getAsOpaquePtr());
return T; return T;
} }
void CGDebugInfo::addHeapAllocSiteMetadata(llvm::CallBase *CI, void CGDebugInfo::addHeapAllocSiteMetadata(llvm::CallBase *CI,
QualType AllocatedTy, QualType AllocatedTy,
SourceLocation Loc) { SourceLocation Loc) {
if (CGM.getCodeGenOpts().getDebugInfo() <=
codegenoptions::DebugLineTablesOnly)
return;
llvm::MDNode *node; llvm::MDNode *node;
if (AllocatedTy->isVoidType()) if (AllocatedTy->isVoidType())
node = llvm::MDNode::get(CGM.getLLVMContext(), None); node = llvm::MDNode::get(CGM.getLLVMContext(), None);
else else
node = getOrCreateType(AllocatedTy, getOrCreateFile(Loc)); node = getOrCreateType(AllocatedTy, getOrCreateFile(Loc));
CI->setMetadata("heapallocsite", node); CI->setMetadata("heapallocsite", node);
} }
▲ Show 20 Lines • Show All 2,827 Lines • Show Last 20 Lines

clang/lib/CodeGen/CGExprCXX.cpp

Show First 20 Lines • Show All 1,633 Lines • ▼ Show 20 Lines if (allocator->isReservedGlobalPlacementOperator()) {
// FIXME: Why do we not pass a CalleeDecl here? // FIXME: Why do we not pass a CalleeDecl here?
EmitCallArgs(allocatorArgs, allocatorType, E->placement_arguments(), EmitCallArgs(allocatorArgs, allocatorType, E->placement_arguments(),
/*AC*/AbstractCallee(), /*ParamsToSkip*/ParamsToSkip); /*AC*/AbstractCallee(), /*ParamsToSkip*/ParamsToSkip);
RValue RV = RValue RV =
EmitNewDeleteCall(*this, allocator, allocatorType, allocatorArgs); EmitNewDeleteCall(*this, allocator, allocatorType, allocatorArgs);
// Set !heapallocsite metadata on the call to operator new. // Set !heapallocsite metadata on the call to operator new.
if (CGM.getCodeGenOpts().getDebugInfo() != codegenoptions::NoDebugInfo && if (getDebugInfo())
getDebugInfo())
if (auto *newCall = dyn_cast<llvm::CallBase>(RV.getScalarVal())) if (auto *newCall = dyn_cast<llvm::CallBase>(RV.getScalarVal()))
getDebugInfo()->addHeapAllocSiteMetadata(newCall, allocType, getDebugInfo()->addHeapAllocSiteMetadata(newCall, allocType,
E->getExprLoc()); E->getExprLoc());
// If this was a call to a global replaceable allocation function that does // If this was a call to a global replaceable allocation function that does
// not take an alignment argument, the allocator is known to produce // 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 // storage that's suitably aligned for any object that fits, up to a known
// threshold. Otherwise assume it's suitably aligned for the allocated type. // threshold. Otherwise assume it's suitably aligned for the allocated type.
▲ Show 20 Lines • Show All 657 Lines • Show Last 20 Lines