Revert "[SLP]Fix PR85082: PHI node has multiple entries."

This reverts commit 8237520 to fix
a crash in https://lab.llvm.org/buildbot/#/builders/198/builds/8891.

Author: alexey-bataev

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

@@ -12582,7 +12582,6 @@ Value *BoUpSLP::vectorizeTree(
             Ex = I;
           }
         }
-        Value *ExV = Ex;
         if (!Ex) {
           // "Reuse" the existing extract to improve final codegen.
           if (auto *ES = dyn_cast<ExtractElementInst>(Scalar)) {
@@ -12593,13 +12592,7 @@ Value *BoUpSLP::vectorizeTree(
           } else {
             Ex = Builder.CreateExtractElement(Vec, Lane);
           }
-          // If necessary, sign-extend or zero-extend ScalarRoot
-          // to the larger type.
-          ExV = Ex;
-          if (Scalar->getType() != Ex->getType())
-            ExV = Builder.CreateIntCast(Ex, Scalar->getType(),
-                                        MinBWs.find(E)->second.second);
-          if (auto *I = dyn_cast<Instruction>(ExV))
+          if (auto *I = dyn_cast<Instruction>(Ex))
             ScalarToEEs[Scalar].try_emplace(Builder.GetInsertBlock(), I);
         }
         // The then branch of the previous if may produce constants, since 0
@@ -12608,7 +12601,12 @@ Value *BoUpSLP::vectorizeTree(
           GatherShuffleExtractSeq.insert(ExI);
           CSEBlocks.insert(ExI->getParent());
         }
-        return ExV;
+        // If necessary, sign-extend or zero-extend ScalarRoot
+        // to the larger type.
+        if (Scalar->getType() != Ex->getType())
+          return Builder.CreateIntCast(Ex, Scalar->getType(),
+                                       MinBWs.find(E)->second.second);
+        return Ex;
       }
       assert(isa<FixedVectorType>(Scalar->getType()) &&
              isa<InsertElementInst>(Scalar) &&