From 0e2cec075c98fe33623229dcb6ee6275f2897de4 Mon Sep 17 00:00:00 2001 From: Sebastian Pop Date: Fri, 22 Jul 2016 00:07:01 +0000 Subject: [PATCH] GVN-hoist: move check before mutating the IR llvm-svn: 276368 --- llvm/lib/Transforms/Scalar/GVNHoist.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/llvm/lib/Transforms/Scalar/GVNHoist.cpp b/llvm/lib/Transforms/Scalar/GVNHoist.cpp index c420089..e7179a3 100644 --- a/llvm/lib/Transforms/Scalar/GVNHoist.cpp +++ b/llvm/lib/Transforms/Scalar/GVNHoist.cpp @@ -585,9 +585,14 @@ public: Gep = dyn_cast(St->getPointerOperand()); Val = dyn_cast(St->getValueOperand()); // Check that the stored value is available. - if (Val && !isa(Val) && - !DT->dominates(Val->getParent(), HoistPt)) - return false; + if (Val) { + if (isa(Val)) { + // Check whether we can compute the GEP at HoistPt. + if (!allOperandsAvailable(Val, HoistPt)) + return false; + } else if (!DT->dominates(Val->getParent(), HoistPt)) + return false; + } } // Check whether we can compute the Gep at HoistPt. @@ -613,9 +618,6 @@ public: // Also copy Val when it is a GEP. if (Val && isa(Val)) { - // Check whether we can compute the GEP at HoistPt. - if (!allOperandsAvailable(Val, HoistPt)) - return false; Instruction *ClonedVal = Val->clone(); ClonedVal->insertBefore(HoistPt->getTerminator()); // Conservatively discard any optimization hints, they may differ on the -- 2.7.4