Ping. Anyone have thoughts on this? Justin Bogner <[email protected]> writes: > I'm seeing a couple of asserts in DiagnoseOutOfRangeComparison when C11 > atomics are involved. The attached patch fixes them, but it doesn't seem > like a very scalable approach. Does anyone have a better idea for how to > handle this? > > If not, ok to commit?
commit 06b48654b66dd64a895ad0d67c7ab6d7fd003c0b Author: Justin Bogner <[email protected]> Date: Fri Jul 11 13:55:11 2014 -0700 Sema: Handle C11 atomics when diagnosing out of range comparisons This fixes a couple of asserts when analyzing comparisons involving C11 atomics that were uncovered by r205608 when we extended the applicability of -Wtautological-constant-out-of-range-compare. diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp index f7d5623..a8b93ed 100644 --- a/lib/Sema/SemaChecking.cpp +++ b/lib/Sema/SemaChecking.cpp @@ -4913,6 +4913,8 @@ struct IntRange { T = VT->getElementType().getTypePtr(); if (const ComplexType *CT = dyn_cast<ComplexType>(T)) T = CT->getElementType().getTypePtr(); + if (const AtomicType *AT = dyn_cast<AtomicType>(T)) + T = AT->getValueType().getTypePtr(); // For enum types, use the known bit width of the enumerators. if (const EnumType *ET = dyn_cast<EnumType>(T)) { @@ -4948,6 +4950,8 @@ struct IntRange { T = VT->getElementType().getTypePtr(); if (const ComplexType *CT = dyn_cast<ComplexType>(T)) T = CT->getElementType().getTypePtr(); + if (const AtomicType *AT = dyn_cast<AtomicType>(T)) + T = AT->getValueType().getTypePtr(); if (const EnumType *ET = dyn_cast<EnumType>(T)) T = C.getCanonicalType(ET->getDecl()->getIntegerType()).getTypePtr(); @@ -5350,6 +5354,8 @@ static void DiagnoseOutOfRangeComparison(Sema &S, BinaryOperator *E, // TODO: Investigate using GetExprRange() to get tighter bounds // on the bit ranges. QualType OtherT = Other->getType(); + if (const AtomicType *AT = dyn_cast<AtomicType>(OtherT)) + OtherT = AT->getValueType(); IntRange OtherRange = IntRange::forValueOfType(S.Context, OtherT); unsigned OtherWidth = OtherRange.Width; diff --git a/test/Sema/atomic-compare.c b/test/Sema/atomic-compare.c new file mode 100644 index 0000000..2eed091 --- /dev/null +++ b/test/Sema/atomic-compare.c @@ -0,0 +1,21 @@ +// RUN: %clang_cc1 %s -verify -fsyntax-only + +void f(_Atomic(int) a, _Atomic(int) b) { + if (a > b) {} // no warning + if (a < b) {} // no warning + if (a >= b) {} // no warning + if (a <= b) {} // no warning + if (a == b) {} // no warning + if (a != b) {} // no warning + + if (a == 0) {} // no warning + if (a > 0) {} // no warning + if (a > 1) {} // no warning + if (a > 2) {} // no warning + + if (!a > 0) {} // no warning + if (!a > 1) {} // expected-warning {{comparison of constant 1 with boolean expression is always false}} + if (!a > 2) {} // expected-warning {{comparison of constant 2 with boolean expression is always false}} + if (!a > b) {} // no warning + if (!a > -1) {} // expected-warning {{comparison of constant -1 with boolean expression is always true}} +} diff --git a/test/Sema/atomic-expr.c b/test/Sema/atomic-expr.c index 5602d54..997ee90 100644 --- a/test/Sema/atomic-expr.c +++ b/test/Sema/atomic-expr.c @@ -58,3 +58,6 @@ int func_13 (int x, unsigned y) { return x ? data1 : y; } +int func_14 () { + return data1 == 0; +}
_______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
