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

This reverts commit 59ff907 to fix
crash revealed in https://lab.llvm.org/buildbot/#/builders/198/builds/8881

Author: alexey-bataev

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

@@ -12592,11 +12592,6 @@ Value *BoUpSLP::vectorizeTree(
           } else {
             Ex = Builder.CreateExtractElement(Vec, Lane);
           }
-          // If necessary, sign-extend or zero-extend ScalarRoot
-          // to the larger type.
-          if (Scalar->getType() != Ex->getType())
-            Ex = Builder.CreateIntCast(Ex, Scalar->getType(),
-                                       MinBWs.find(E)->second.second);
           if (auto *I = dyn_cast<Instruction>(Ex))
             ScalarToEEs[Scalar].try_emplace(Builder.GetInsertBlock(), I);
         }
@@ -12606,6 +12601,11 @@ Value *BoUpSLP::vectorizeTree(
           GatherShuffleExtractSeq.insert(ExI);
           CSEBlocks.insert(ExI->getParent());
         }
+        // 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()) &&