6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-10-02 17:55:18 +00:00
Code Issues Projects Releases Wiki Activity

Don't segfault on mutual recursion, as pointed out by Frits.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@127975 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Anders Carlsson 2011-03-20 20:16:43 +00:00
parent 1f7c7ba380
commit 372ec6aa91
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Transforms/IPO/GlobalOpt.cpp
View File

@ -2723,7 +2723,8 @@ static Function *FindCXAAtExit(Module &M) {
/// Note that we assume that other optimization passes have already simplified
/// the code so we only look for a function with a single basic block, where
/// the only allowed instructions are 'ret' or 'call' to empty C++ dtor.
static bool cxxDtorIsEmpty(const Function& Fn) {
static bool cxxDtorIsEmpty(const Function &Fn,
SmallPtrSet<const Function *, 8> &CalledFunctions) {
// FIXME: We could eliminate C++ destructors if they're readonly/readnone and
// unwind, but that doesn't seem worth doing.
if (Fn.isDeclaration())
@ -2742,10 +2743,10 @@ static bool cxxDtorIsEmpty(const Function& Fn) {
return false;
// Don't treat recursive functions as empty.
if (CalledFn == &Fn)
if (!CalledFunctions.insert(CalledFn))
return false;
if (!cxxDtorIsEmpty(*CalledFn))
if (!cxxDtorIsEmpty(*CalledFn, CalledFunctions))
return false;
} else if (isa<ReturnInst>(*I))
return true;
@ -2784,7 +2785,8 @@ bool GlobalOpt::OptimizeEmptyGlobalCXXDtors(Function *CXAAtExitFn) {
if (!DtorFn)
continue;
if (!cxxDtorIsEmpty(*DtorFn))
SmallPtrSet<const Function *, 8> CalledFunctions;
if (!cxxDtorIsEmpty(*DtorFn, CalledFunctions))
continue;
// Just remove the call.