maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[CGDebugInfo] Simplify EmitFunctionDecl parameters, NFC" 

This reverts commit 1af41074445229fea66b99710a850e5f42ecfa95.

llvm-svn: 365814
This commit is contained in:
Vedant Kumar 2019-07-11 19:28:07 +00:00
parent 2bc8ab6852
commit 8bd5214726
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3621,19 +3621,18 @@ void CGDebugInfo::EmitFunctionStart(GlobalDecl GD, SourceLocation Loc,
RegionMap[D].reset(SP);
}
llvm::DISubprogram *CGDebugInfo::EmitFunctionDecl(GlobalDecl GD,
SourceLocation Loc,
QualType FnType,
bool IsDeclForCallSite) {
void CGDebugInfo::EmitFunctionDecl(GlobalDecl GD, SourceLocation Loc,
QualType FnType, llvm::Function *Fn) {
StringRef Name;
StringRef LinkageName;
const Decl *D = GD.getDecl();
if (!D)
return nullptr;
return;
llvm::DINode::DIFlags Flags = llvm::DINode::FlagZero;
llvm::DIFile *Unit = getOrCreateFile(Loc);
bool IsDeclForCallSite = Fn ? true : false;
llvm::DIScope *FDContext =
IsDeclForCallSite ? Unit : getDeclContextDescriptor(D);
llvm::DINodeArray TParamsArray;
@ -3666,8 +3665,11 @@ llvm::DISubprogram *CGDebugInfo::EmitFunctionDecl(GlobalDecl GD,
FDContext, Name, LinkageName, Unit, LineNo,
getOrCreateFunctionType(D, FnType, Unit), ScopeLine, Flags, SPFlags,
TParamsArray.get(), getFunctionDeclaration(D));
if (IsDeclForCallSite)
Fn->setSubprogram(SP);
DBuilder.retainType(SP);
return SP;
}
void CGDebugInfo::EmitFuncDeclForCallSite(llvm::CallBase *CallOrInvoke,
@ -3689,13 +3691,8 @@ void CGDebugInfo::EmitFuncDeclForCallSite(llvm::CallBase *CallOrInvoke,
if (Func->getSubprogram())
return;
if (!CalleeDecl->isStatic() && !CalleeDecl->isInlined()) {
llvm::DISubprogram *SP =
EmitFunctionDecl(CalleeDecl, CalleeDecl->getLocation(), CalleeType,
/*IsDeclForCallSite=*/true);
assert(SP && "Could not find decl for callee?");
Func->setSubprogram(SP);
}
if (!CalleeDecl->isStatic() && !CalleeDecl->isInlined())
EmitFunctionDecl(CalleeDecl, CalleeDecl->getLocation(), CalleeType, Func);
}
void CGDebugInfo::EmitInlineFunctionStart(CGBuilderTy &Builder, GlobalDecl GD) {

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

@ -408,11 +408,10 @@ public:
/// End an inlined function scope.
void EmitInlineFunctionEnd(CGBuilderTy &Builder);
/// Emit debug info for a function declaration. Set \p IsDeclForCallSite if
/// a call site entry must reference the declaration.
llvm::DISubprogram *EmitFunctionDecl(GlobalDecl GD, SourceLocation Loc,
QualType FnType,
bool IsDeclForCallSite = false);
/// Emit debug info for a function declaration.
/// \p Fn is set only when a declaration for a debug call site gets created.
void EmitFunctionDecl(GlobalDecl GD, SourceLocation Loc,
QualType FnType, llvm::Function *Fn = nullptr);
/// Emit debug info for an extern function being called.
/// This is needed for call site debug info.