Fix type of shuffle resulted from shuffle merge.

This fix resolves PR19730.


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

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/Transforms/InstCombine/InstCombineVectorOps.cpp b/lib/Transforms/InstCombine/InstCombineVectorOps.cpp
index bd647d9e1cd..8c5e202b5c5 100644
--- a/lib/Transforms/InstCombine/InstCombineVectorOps.cpp
+++ b/lib/Transforms/InstCombine/InstCombineVectorOps.cpp
@@ -1114,12 +1114,10 @@ Instruction *InstCombiner::visitShuffleVectorInst(ShuffleVectorInst &SVI) {
 
   // If the result mask is an identity, replace uses of this instruction with
   // corresponding argument.
-  if (VWidth == LHSWidth) {
-    bool isLHSID, isRHSID;
-    RecognizeIdentityMask(newMask, isLHSID, isRHSID);
-    if (isLHSID) return ReplaceInstUsesWith(SVI, newLHS);
-    if (isRHSID) return ReplaceInstUsesWith(SVI, newRHS);
-  }
+  bool isLHSID, isRHSID;
+  RecognizeIdentityMask(newMask, isLHSID, isRHSID);
+  if (isLHSID && VWidth == LHSOp0Width) return ReplaceInstUsesWith(SVI, newLHS);
+  if (isRHSID && VWidth == RHSOp0Width) return ReplaceInstUsesWith(SVI, newRHS);
 
   return MadeChange ? &SVI : nullptr;
 }