summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorTed Kremenek <kremenek@apple.com>2011-02-18 02:27:00 +0000
committerTed Kremenek <kremenek@apple.com>2011-02-18 02:27:00 +0000
commita7ced2cb4caa71ff09a4674bf4c7d9890eefb5e9 (patch)
tree1e2f33287dc978db9c0e3655bae75e76d9418aba /clang/lib
parent14a552b2d71d4a4cf496953f62bc1337cbd8f9dc (diff)
downloadbcm5719-llvm-a7ced2cb4caa71ff09a4674bf4c7d9890eefb5e9.tar.gz
bcm5719-llvm-a7ced2cb4caa71ff09a4674bf4c7d9890eefb5e9.zip
Fix assertion failure on -Warray-bounds for 32-bit builds of Clang.
llvm-svn: 125821
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Sema/SemaChecking.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index 6b1013d82dd..2cddac5f667 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -3109,11 +3109,14 @@ void Sema::CheckArrayAccess(const clang::ArraySubscriptExpr *E) {
return;
if (!index.isNegative()) {
- const llvm::APInt &size = ArrayTy->getSize();
+ llvm::APInt size = ArrayTy->getSize();
if (!size.isStrictlyPositive())
return;
if (size.getBitWidth() > index.getBitWidth())
index = index.sext(size.getBitWidth());
+ else if (size.getBitWidth() < index.getBitWidth())
+ size = size.sext(index.getBitWidth());
+
if (index.slt(size))
return;
OpenPOWER on IntegriCloud