[cfe-commits] r96970 - in /cfe/trunk: lib/Sema/SemaChecking.cpp test/Sema/conversion.c
John McCall
rjmccall at apple.com
Tue Feb 23 11:22:29 PST 2010
Author: rjmccall
Date: Tue Feb 23 13:22:29 2010
New Revision: 96970
URL: http://llvm.org/viewvc/llvm-project?rev=96970&view=rev
Log:
Don't assert on compound assignment operators that operate in FP types when
the result is integral. Fixes <rdar://problem/7676608>.
Modified:
cfe/trunk/lib/Sema/SemaChecking.cpp
cfe/trunk/test/Sema/conversion.c
Modified: cfe/trunk/lib/Sema/SemaChecking.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=96970&r1=96969&r2=96970&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaChecking.cpp (original)
+++ cfe/trunk/lib/Sema/SemaChecking.cpp Tue Feb 23 13:22:29 2010
@@ -1682,13 +1682,13 @@
}
// Returns the supremum of two ranges: i.e. their conservative merge.
- static IntRange join(const IntRange &L, const IntRange &R) {
+ static IntRange join(IntRange L, IntRange R) {
return IntRange(std::max(L.Width, R.Width),
L.NonNegative && R.NonNegative);
}
// Returns the infinum of two ranges: i.e. their aggressive merge.
- static IntRange meet(const IntRange &L, const IntRange &R) {
+ static IntRange meet(IntRange L, IntRange R) {
return IntRange(std::min(L.Width, R.Width),
L.NonNegative || R.NonNegative);
}
@@ -1806,6 +1806,15 @@
case BinaryOperator::NE:
return IntRange::forBoolType();
+ // The type of these compound assignments is the type of the LHS,
+ // so the RHS is not necessarily an integer.
+ case BinaryOperator::MulAssign:
+ case BinaryOperator::DivAssign:
+ case BinaryOperator::RemAssign:
+ case BinaryOperator::AddAssign:
+ case BinaryOperator::SubAssign:
+ return IntRange::forType(C, E->getType());
+
// Operations with opaque sources are black-listed.
case BinaryOperator::PtrMemD:
case BinaryOperator::PtrMemI:
@@ -1813,15 +1822,18 @@
// Bitwise-and uses the *infinum* of the two source ranges.
case BinaryOperator::And:
+ case BinaryOperator::AndAssign:
return IntRange::meet(GetExprRange(C, BO->getLHS(), MaxWidth),
GetExprRange(C, BO->getRHS(), MaxWidth));
// Left shift gets black-listed based on a judgement call.
case BinaryOperator::Shl:
+ case BinaryOperator::ShlAssign:
return IntRange::forType(C, E->getType());
// Right shift by a constant can narrow its left argument.
- case BinaryOperator::Shr: {
+ case BinaryOperator::Shr:
+ case BinaryOperator::ShrAssign: {
IntRange L = GetExprRange(C, BO->getLHS(), MaxWidth);
// If the shift amount is a positive constant, drop the width by
Modified: cfe/trunk/test/Sema/conversion.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/conversion.c?rev=96970&r1=96969&r2=96970&view=diff
==============================================================================
--- cfe/trunk/test/Sema/conversion.c (original)
+++ cfe/trunk/test/Sema/conversion.c Tue Feb 23 13:22:29 2010
@@ -279,3 +279,11 @@
// This should show up despite the caret being inside a macro substitution
char s = LONG_MAX; // expected-warning {{implicit cast loses integer precision: 'long' to 'char'}}
}
+
+// <rdar://problem/7676608>: assertion for compound operators with non-integral RHS
+void f7676608(int);
+void test_7676608(void) {
+ float q = 0.7f;
+ char c = 5;
+ f7676608(c *= q);
+}
More information about the cfe-commits
mailing list