From c0952c8a08098f7d1f97d468d445cb94b034699f Mon Sep 17 00:00:00 2001 From: Carlos Alberto Enciso Date: Wed, 10 Oct 2018 12:09:34 +0000 Subject: Revert "[DebugInfo][Dexter] Unreachable line stepped onto after SimplifyCFG." This reverts commit r344120. It was causing buildbot failures. llvm-svn: 344135 --- llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'llvm/lib/Transforms/Utils/SimplifyCFG.cpp') diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 3e73c537292..ebbcf800254 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -2375,10 +2375,24 @@ static bool FoldTwoEntryPHINode(PHINode *PN, const TargetTransformInfo &TTI, // Move all 'aggressive' instructions, which are defined in the // conditional parts of the if's up to the dominating block. - if (IfBlock1) - hoistAllInstructionsInto(DomBlock, InsertPt, IfBlock1); - if (IfBlock2) - hoistAllInstructionsInto(DomBlock, InsertPt, IfBlock2); + if (IfBlock1) { + for (auto &I : *IfBlock1) { + I.dropUnknownNonDebugMetadata(); + dropDebugUsers(I); + } + DomBlock->getInstList().splice(InsertPt->getIterator(), + IfBlock1->getInstList(), IfBlock1->begin(), + IfBlock1->getTerminator()->getIterator()); + } + if (IfBlock2) { + for (auto &I : *IfBlock2) { + I.dropUnknownNonDebugMetadata(); + dropDebugUsers(I); + } + DomBlock->getInstList().splice(InsertPt->getIterator(), + IfBlock2->getInstList(), IfBlock2->begin(), + IfBlock2->getTerminator()->getIterator()); + } while (PHINode *PN = dyn_cast(BB->begin())) { // Change the PHI node into a select instruction. -- cgit v1.2.3