From 0942e0b5e17f05858fa6fbca37496e4f7e714668 Mon Sep 17 00:00:00 2001 From: Joey Gouly Date: Tue, 29 Jan 2013 15:09:40 +0000 Subject: [PATCH] Fix a crash in OpenCL code by using the proper (RHS) bit-width. llvm-svn: 173802 --- clang/lib/AST/ExprConstant.cpp | 4 ++-- clang/test/SemaOpenCL/shifts.cl | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp index 4ea6399..ae86150 100644 --- a/clang/lib/AST/ExprConstant.cpp +++ b/clang/lib/AST/ExprConstant.cpp @@ -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(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(LHS.getBitWidth() - 1)), RHS.isUnsigned()); else if (RHS.isSigned() && RHS.isNegative()) { diff --git a/clang/test/SemaOpenCL/shifts.cl b/clang/test/SemaOpenCL/shifts.cl index f71927c..5b0c6fb 100644 --- a/clang/test/SemaOpenCL/shifts.cl +++ b/clang/test/SemaOpenCL/shifts.cl @@ -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); } -- 2.7.4