[RewriteStatepointsForGC] Minor refactor to use shared implementation [NFC]

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@247223 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp b/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
index 57687def2d9e4b6833ecf49390bfb9273c9dbbd1..2bb0918f6eb5bce17935f41958d3ce34c68c6aa1 100644 (file)
--- a/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
+++ b/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
@@ -1029,14 +1029,7 @@ static Value *findBasePointer(Value *I, DefiningValueMapTy &cache) {
       auto *BdvIE = cast<InsertElementInst>(BDV);
       auto UpdateOperand = [&](int OperandIdx) {
         Value *InVal = BdvIE->getOperand(OperandIdx);
       auto *BdvIE = cast<InsertElementInst>(BDV);
       auto UpdateOperand = [&](int OperandIdx) {
         Value *InVal = BdvIE->getOperand(OperandIdx);

-        Value *Base = findBaseOrBDV(InVal, cache);
-        if (!isKnownBaseResult(Base)) {
-          // Either conflict or base.
-          assert(States.count(Base));
-          Base = States[Base].getBase();
-          assert(Base != nullptr && "unknown BDVState!");
-        }
-        assert(Base && "can't be null");
+        Value *Base = getBaseForInput(InVal, BaseIE);

         BaseIE->setOperand(OperandIdx, Base);
       };
       UpdateOperand(0); // vector operand
         BaseIE->setOperand(OperandIdx, Base);
       };
       UpdateOperand(0); // vector operand