From 06a45483a179d125c8c76419c70fc1f173cfb698 Mon Sep 17 00:00:00 2001 From: James Molloy Date: Wed, 31 Aug 2016 13:16:36 +0000 Subject: Revert "[SimplifyCFG] Add a workaround to fix PR30188" This reverts commit r280219. r280216 caused buildbot failures - backing out the entire chain. llvm-svn: 280232 --- llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 10 ---------- 1 file changed, 10 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 3de6c6069a8..3404a4dfdda 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1424,16 +1424,6 @@ static bool canSinkInstructions( // FIXME: if the call was *already* indirect, we should do this. return false; } - // Because SROA can't handle speculating stores of selects, try not - // to sink stores of allocas when we'd have to create a PHI for the - // address operand. - // FIXME: This is a workaround for a deficiency in SROA - see - // https://llvm.org/bugs/show_bug.cgi?id=30188 - if (OI == 1 && isa(I0) && - any_of(Insts, [](const Instruction *I) { - return isa(I->getOperand(1)); - })) - return false; for (auto *I : Insts) PHIOperands[I].push_back(I->getOperand(OI)); } -- cgit v1.2.3