[llvm-branch-commits] [llvm-branch] r195740 - Merging r195343:

[Bill Wendling]

Author: void
Date: Tue Nov 26 05:16:17 2013
New Revision: 195740

URL: http://llvm.org/viewvc/llvm-project?rev=195740&view=rev
Log:
Merging r195343:
------------------------------------------------------------------------
r195343 | dsanders | 2013-11-21 03:40:14 -0800 (Thu, 21 Nov 2013) | 5 lines

[mips][msa/dsp] Only do DSP combines if DSP is enabled.

Fixes a crash (null pointer dereferenced) when MSA is enabled.


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

Added:
    llvm/branches/release_34/test/CodeGen/Mips/msa/llvm-stress-s2704903805.ll
      - copied unchanged from r195343, llvm/trunk/test/CodeGen/Mips/msa/llvm-stress-s2704903805.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:17 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,195355,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,195379,195397-195399,195421,195423,195432,195439,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=195740&r1=195739&r2=195740&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:17 2013
@@ -751,6 +751,9 @@ static SDValue performDSPShiftCombine(un
   unsigned EltSize = Ty.getVectorElementType().getSizeInBits();
   BuildVectorSDNode *BV = dyn_cast<BuildVectorSDNode>(N->getOperand(1));
 
+  if (!Subtarget->hasDSP())
+    return SDValue();
+
   if (!BV ||
       !BV->isConstantSplat(SplatValue, SplatUndef, SplatBitSize, HasAnyUndefs,
                            EltSize, !Subtarget->isLittle()) ||