From 55e69d179b53adaab6366f4938bcf3da7cd6402f Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Sun, 14 Mar 2010 10:40:55 +0000 Subject: Skip over debug info when trying to merge two return BBs. llvm-svn: 98491 --- llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'llvm/lib/Transforms') diff --git a/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp b/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp index 62f34a2ee06..952d1a8ffb8 100644 --- a/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp +++ b/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp @@ -26,6 +26,7 @@ #include "llvm/Transforms/Utils/Local.h" #include "llvm/Constants.h" #include "llvm/Instructions.h" +#include "llvm/IntrinsicInst.h" #include "llvm/Module.h" #include "llvm/Attributes.h" #include "llvm/Support/CFG.h" @@ -210,12 +211,16 @@ static bool MergeEmptyReturnBlocks(Function &F) { // Check for something else in the block. BasicBlock::iterator I = Ret; --I; - if (!isa(I) || I != BB.begin() || - Ret->getNumOperands() == 0 || - Ret->getOperand(0) != I) + // Skip over debug info. + while (isa(I) && I != BB.begin()) + --I; + if (!isa(I) && + (!isa(I) || I != BB.begin() || + Ret->getNumOperands() == 0 || + Ret->getOperand(0) != I)) continue; } - + // If this is the first returning block, remember it and keep going. if (RetBlock == 0) { RetBlock = &BB; -- cgit v1.2.3