Turn off implicit truncation warning for compound assignment to bitfields; it might...

<rdar://problem/10238797>, part 2.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149095 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp
index 8d01352fd221aa9b2e0aa63386657a1c48d943b3..7579a5d0eebc81c727c43f7f94c0f53f122b1971 100644 (file)
--- a/lib/Sema/SemaChecking.cpp
+++ b/lib/Sema/SemaChecking.cpp
@@ -4053,8 +4053,8 @@ void AnalyzeImplicitConversions(Sema &S, Expr *OrigE, SourceLocation CC) {
     if (BO->isComparisonOp())
       return AnalyzeComparison(S, BO);
 
-    // And with assignments and compound assignments.
-    if (BO->isAssignmentOp())
+    // And with simple assignments.
+    if (BO->getOpcode() == BO_Assign)
       return AnalyzeAssignment(S, BO);
   }
 

diff --git a/test/Sema/constant-conversion.c b/test/Sema/constant-conversion.c
index c97eb05cd190fbb27bdd95232b3939f59ba2201c..e3097f8be30e85862a8d1c1b9399a6b7e6b971a4 100644 (file)
--- a/test/Sema/constant-conversion.c
+++ b/test/Sema/constant-conversion.c
@@ -71,4 +71,6 @@ void test7() {
 
        f.twoBits1 = ~1; // expected-warning {{implicit truncation from 'int' to bitfield changes value from -2 to 2}}
        f.twoBits2 = ~2; // expected-warning {{implicit truncation from 'int' to bitfield changes value from -3 to 1}}
+       f.twoBits1 &= ~1; // no-warning
+       f.twoBits2 &= ~2; // no-warning
 }