From 392e975693cf745c4c85ccbb2b0d6294086d1d2a Mon Sep 17 00:00:00 2001 From: Xinliang David Li Date: Sun, 14 May 2017 02:54:02 +0000 Subject: Fix test failure on windows -- do not return deleted func llvm-svn: 302999 --- llvm/lib/Transforms/IPO/PartialInlining.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Transforms/IPO/PartialInlining.cpp') diff --git a/llvm/lib/Transforms/IPO/PartialInlining.cpp b/llvm/lib/Transforms/IPO/PartialInlining.cpp index 5550376279f..739b0dae314 100644 --- a/llvm/lib/Transforms/IPO/PartialInlining.cpp +++ b/llvm/lib/Transforms/IPO/PartialInlining.cpp @@ -715,9 +715,15 @@ Function *PartialInlinerImpl::unswitchFunction(Function *F) { // users (function pointers, etc.) back to the original function. DuplicateFunction->replaceAllUsesWith(F); DuplicateFunction->eraseFromParent(); - if (!AnyInline && OutlinedFunction) + + if (AnyInline) + return OutlinedFunction; + + // Remove the function that is speculatively created: + if (OutlinedFunction) OutlinedFunction->eraseFromParent(); - return OutlinedFunction; + + return nullptr; } bool PartialInlinerImpl::tryPartialInline(Function *DuplicateFunction, -- cgit v1.2.3