[llvm-branch-commits] [llvm-branch] r204645 - Merging r200776:

[Tom Stellard]

Author: tstellar
Date: Mon Mar 24 13:21:37 2014
New Revision: 204645

URL: http://llvm.org/viewvc/llvm-project?rev=204645&view=rev
Log:
Merging r200776:

------------------------------------------------------------------------
r200776 | thomas.stellard | 2014-02-04 09:18:43 -0800 (Tue, 04 Feb 2014) | 9 lines

R600/SI: Expand i1 BR_CC

This fixes a crashes in the OpenCV test suite and also the scrypt
kernel in bfgminer.

I was unable to come up with a reduced test case for this.

https://bugs.freedesktop.org/show_bug.cgi?id=72785

Modified:
    llvm/branches/release_34/lib/Target/R600/AMDGPUISelLowering.cpp

Modified: llvm/branches/release_34/lib/Target/R600/AMDGPUISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/Target/R600/AMDGPUISelLowering.cpp?rev=204645&r1=204644&r2=204645&view=diff
==============================================================================
--- llvm/branches/release_34/lib/Target/R600/AMDGPUISelLowering.cpp (original)
+++ llvm/branches/release_34/lib/Target/R600/AMDGPUISelLowering.cpp Mon Mar 24 13:21:37 2014
@@ -133,6 +133,8 @@ AMDGPUTargetLowering::AMDGPUTargetLoweri
   setLoadExtAction(ISD::SEXTLOAD, MVT::v4i16, Expand);
   setLoadExtAction(ISD::ZEXTLOAD, MVT::v4i16, Expand);
 
+  setOperationAction(ISD::BR_CC, MVT::i1, Expand);
+
   setOperationAction(ISD::FNEG, MVT::v2f32, Expand);
   setOperationAction(ISD::FNEG, MVT::v4f32, Expand);