[llvm-branch-commits] [llvm-branch] r195742 - Merging r195444:

[Bill Wendling]

Author: void
Date: Tue Nov 26 05:16:52 2013
New Revision: 195742

URL: http://llvm.org/viewvc/llvm-project?rev=195742&view=rev
Log:
Merging r195444:
------------------------------------------------------------------------
r195444 | dsanders | 2013-11-22 03:24:50 -0800 (Fri, 22 Nov 2013) | 4 lines

[mips][msa] Float vector constants cannot use ldi.[wd] directly. Bitcast from the appropriate integer vector type.

Fixes an instruction selection failure detected by llvm-stress.

------------------------------------------------------------------------

Added:
    llvm/branches/release_34/test/CodeGen/Mips/msa/llvm-stress-s2501752154-simplified.ll
      - copied unchanged from r195444, llvm/trunk/test/CodeGen/Mips/msa/llvm-stress-s2501752154-simplified.ll
Modified:
    llvm/branches/release_34/   (props changed)
    llvm/branches/release_34/lib/Target/Mips/MipsSEISelLowering.cpp

Propchange: llvm/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 26 05:16:52 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195136,195138,195152,195156-195157,195161-195162,195193,195272,195317-195318,195327,195330,195333,195339,195343,195355,195364,195379,195397-195399,195421,195423,195432,195439,195476-195477,195479,195491-195493,195514,195528,195547,195567,195591,195599,195632,195635-195636,195670,195679,195716
+/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195136,195138,195152,195156-195157,195161-195162,195193,195272,195317-195318,195327,195330,195333,195339,195343,195355,195364,195379,195397-195399,195421,195423,195432,195439,195444,195476-195477,195479,195491-195493,195514,195528,195547,195567,195591,195599,195632,195635-195636,195670,195679,195716

Modified: llvm/branches/release_34/lib/Target/Mips/MipsSEISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/Target/Mips/MipsSEISelLowering.cpp?rev=195742&r1=195741&r2=195742&view=diff
==============================================================================
--- llvm/branches/release_34/lib/Target/Mips/MipsSEISelLowering.cpp (original)
+++ llvm/branches/release_34/lib/Target/Mips/MipsSEISelLowering.cpp Tue Nov 26 05:16:52 2013
@@ -2210,7 +2210,9 @@ SDValue MipsSETargetLowering::lowerBUILD
       return SDValue();
 
     // If the value fits into a simm10 then we can use ldi.[bhwd]
-    if (SplatValue.isSignedIntN(10))
+    // However, if it isn't an integer type we will have to bitcast from an
+    // integer type first.
+    if (ResTy.isInteger() && SplatValue.isSignedIntN(10))
       return Op;
 
     EVT ViaVecTy;