[llvm-branch-commits] [llvm-branch] r95331 - in /llvm/branches/Apple/Zoidberg: lib/VMCore/Instructions.cpp test/Transforms/InstCombine/bitcast-sext-vector.ll

[Bill Wendling]

Author: void
Date: Thu Feb  4 16:59:25 2010
New Revision: 95331

URL: http://llvm.org/viewvc/llvm-project?rev=95331&view=rev
Log:
$ svn merge -c 94280 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r94280 into '.':
A    test/Transforms/InstCombine/bitcast-sext-vector.ll
U    lib/VMCore/Instructions.cpp


Added:
    llvm/branches/Apple/Zoidberg/test/Transforms/InstCombine/bitcast-sext-vector.ll
      - copied unchanged from r94280, llvm/trunk/test/Transforms/InstCombine/bitcast-sext-vector.ll
Modified:
    llvm/branches/Apple/Zoidberg/lib/VMCore/Instructions.cpp

Modified: llvm/branches/Apple/Zoidberg/lib/VMCore/Instructions.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/VMCore/Instructions.cpp?rev=95331&r1=95330&r2=95331&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/VMCore/Instructions.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/VMCore/Instructions.cpp Thu Feb  4 16:59:25 2010
@@ -2065,8 +2065,9 @@
       return secondOp;
     case 3: 
       // no-op cast in second op implies firstOp as long as the DestTy 
-      // is integer
-      if (DstTy->isInteger())
+      // is integer and we are not converting between a vector and a
+      // non vector type
+      if (SrcTy->getTypeID() != Type::VectorTyID && DstTy->isInteger())
         return firstOp;
       return 0;
     case 4: