diff options
| author | Joey Gouly <joey.gouly@arm.com> | 2013-01-29 15:09:40 +0000 |
|---|---|---|
| committer | Joey Gouly <joey.gouly@arm.com> | 2013-01-29 15:09:40 +0000 |
| commit | 0942e0b5e17f05858fa6fbca37496e4f7e714668 (patch) | |
| tree | 3dc1e6ccd6c174342e75e2501009714e515f038a /clang | |
| parent | cf3300016eb747755a4cf31638c8d4b0ac1b1ae6 (diff) | |
| download | bcm5719-llvm-0942e0b5e17f05858fa6fbca37496e4f7e714668.tar.gz bcm5719-llvm-0942e0b5e17f05858fa6fbca37496e4f7e714668.zip | |
Fix a crash in OpenCL code by using the proper (RHS) bit-width.
llvm-svn: 173802
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/AST/ExprConstant.cpp | 4 | ||||
| -rw-r--r-- | 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 4ea6399a48e..ae86150ee2a 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<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()) { diff --git a/clang/test/SemaOpenCL/shifts.cl b/clang/test/SemaOpenCL/shifts.cl index f71927c7cf6..5b0c6fbc844 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); } |
