r173802 - Fix a crash in OpenCL code by using the proper (RHS) bit-width.

[Joey Gouly]

Author: joey
Date: Tue Jan 29 09:09:40 2013
New Revision: 173802

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

Fix a crash in OpenCL code by using the proper (RHS) bit-width.

Modified:
    cfe/trunk/lib/AST/ExprConstant.cpp
    cfe/trunk/test/SemaOpenCL/shifts.cl

Modified: cfe/trunk/lib/AST/ExprConstant.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ExprConstant.cpp?rev=173802&r1=173801&r2=173802&view=diff
==============================================================================
--- cfe/trunk/lib/AST/ExprConstant.cpp (original)
+++ cfe/trunk/lib/AST/ExprConstant.cpp Tue Jan 29 09:09:40 2013
@@ -4723,7 +4723,7 @@ bool DataRecursiveIntBinOpEvaluator::
     case BO_Shl: {
       if (Info.getLangOpts().OpenCL)
         // OpenCL 6.3j: shift values are effectively % word size of LHS.
-        RHS &= APSInt(llvm::APInt(LHS.getBitWidth(),
+        RHS &= APSInt(llvm::APInt(RHS.getBitWidth(),
                       static_cast<uint64_t>(LHS.getBitWidth() - 1)),
                       RHS.isUnsigned());
       else if (RHS.isSigned() && RHS.isNegative()) {
@@ -4755,7 +4755,7 @@ bool DataRecursiveIntBinOpEvaluator::
     case BO_Shr: {
       if (Info.getLangOpts().OpenCL)
         // OpenCL 6.3j: shift values are effectively % word size of LHS.
-        RHS &= APSInt(llvm::APInt(LHS.getBitWidth(),
+        RHS &= APSInt(llvm::APInt(RHS.getBitWidth(),
                       static_cast<uint64_t>(LHS.getBitWidth() - 1)),
                       RHS.isUnsigned());
       else if (RHS.isSigned() && RHS.isNegative()) {

Modified: cfe/trunk/test/SemaOpenCL/shifts.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaOpenCL/shifts.cl?rev=173802&r1=173801&r2=173802&view=diff
==============================================================================
--- cfe/trunk/test/SemaOpenCL/shifts.cl (original)
+++ cfe/trunk/test/SemaOpenCL/shifts.cl Tue Jan 29 09:09:40 2013
@@ -2,13 +2,16 @@
 // OpenCL essentially reduces all shift amounts to the last word-size bits before evaluating.
 // Test this both for variables and constants evaluated in the front-end.
 
-//CHECK: @negativeShift32
+// CHECK: @gtest1 = constant i64 2147483648
+__constant const unsigned long gtest1 = 1UL << 31;
+
+// CHECK: @negativeShift32
 int negativeShift32(int a,int b) {
-  //CHECK: %array0 = alloca [256 x i8]
+  // CHECK: %array0 = alloca [256 x i8]
   char array0[((int)1)<<40];
-  //CHECK: %array1 = alloca [256 x i8]
+  // CHECK: %array1 = alloca [256 x i8]
   char array1[((int)1)<<(-24)];
 
-  //CHECK: ret i32 65536
+  // CHECK: ret i32 65536
   return ((int)1)<<(-16);
 }