diff options
-rw-r--r-- | lib/Sema/SemaChecking.cpp | 9 | ||||
-rw-r--r-- | test/Sema/constant-conversion.c | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp index caaa08c0bc..e69ebe2250 100644 --- a/lib/Sema/SemaChecking.cpp +++ b/lib/Sema/SemaChecking.cpp @@ -2612,7 +2612,14 @@ void AnalyzeAssignment(Sema &S, BinaryOperator *E) { if (OriginalWidth > FieldWidth) { llvm::APSInt TruncatedValue = Value; TruncatedValue.trunc(FieldWidth); - TruncatedValue.extend(OriginalWidth); + + // It's fairly common to write values into signed bitfields + // that, if sign-extended, would end up becoming a different + // value. We don't want to warn about that. + if (Value.isSigned() && Value.isNegative()) + TruncatedValue.sext(OriginalWidth); + else + TruncatedValue.zext(OriginalWidth); if (Value != TruncatedValue) { std::string PrettyValue = Value.toString(10); diff --git a/test/Sema/constant-conversion.c b/test/Sema/constant-conversion.c index 5f734f3649..958621266b 100644 --- a/test/Sema/constant-conversion.c +++ b/test/Sema/constant-conversion.c @@ -13,3 +13,8 @@ void test_7809123(void) { a.i5 = 36; // expected-warning {{implicit truncation from 'int' to bitfield changes value from 36 to 4}} } + +void test() { + struct { int bit : 1; } a; + a.bit = 1; // shouldn't warn +} |