Redoing diagnostics to make this an error by default

ojhunt · ojhunt · commit 0cd5127f8e84 · 2024-12-30T19:08:28.000-08:00
diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td
@@ -49,6 +49,8 @@ def SingleBitBitFieldConstantConversion :
   DiagGroup<"single-bit-bitfield-constant-conversion">;
 def BitFieldConstantConversion : DiagGroup<"bitfield-constant-conversion",
                                            [SingleBitBitFieldConstantConversion]>;
+def PreferredTypeBitFieldEnumConversion : DiagGroup<"preferred-type-bitfield-enum-conversion">;
+def PreferredTypeBitFieldWidth : DiagGroup<"preferred-type-bitfield-width">;
 def BitFieldEnumConversion : DiagGroup<"bitfield-enum-conversion">;
 def BitFieldWidth : DiagGroup<"bitfield-width">;
 def CompoundTokenSplitByMacro : DiagGroup<"compound-token-split-by-macro">;
@@ -1114,7 +1116,9 @@ def Most : DiagGroup<"most", [
     PrivateExtern,
     SelTypeCast,
     ExternCCompat,
-    UserDefinedWarnings
+    UserDefinedWarnings,
+    PreferredTypeBitFieldEnumConversion,
+    PreferredTypeBitFieldWidth 
  ]>;
 
 // Thread Safety warnings
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -6423,24 +6423,34 @@ def warn_bitfield_width_exceeds_type_width: Warning<
 def err_bitfield_too_wide : Error<
   "%select{bit-field %1|anonymous bit-field}0 is too wide (%2 bits)">;
 def warn_bitfield_too_small_for_enum : Warning<
-  "bit-field %0 is not wide enough to store all enumerators of %select{|preferred type }1%2">,
+  "bit-field %0 is not wide enough to store all enumerators of %1">,
   InGroup<BitFieldEnumConversion>, DefaultIgnore;
 def note_widen_bitfield : Note<
   "widen this field to %0 bits to store all values of %1">;
 def warn_unsigned_bitfield_assigned_signed_enum : Warning<
-  "assigning value of %select{|preferred }1signed enum type %2 to unsigned bit-field %0; "
+  "assigning value of signed enum type %1 to unsigned bit-field %0; "
   "negative enumerators of enum %1 will be converted to positive values">,
   InGroup<BitFieldEnumConversion>, DefaultIgnore;
 def warn_signed_bitfield_enum_conversion : Warning<
   "signed bit-field %0 needs an extra bit to represent the largest positive "
-  "enumerators of %select{|preferred type }1%2">,
+  "enumerators of %1">,
   InGroup<BitFieldEnumConversion>, DefaultIgnore;
+def warn_preferred_type_bitfield_too_small_for_enum : Warning<
+  "bit-field %0 is not wide enough to store all enumerators of preferred type %1">,
+  InGroup<PreferredTypeBitFieldEnumConversion>, DefaultError;
+def warn_preferred_type_unsigned_bitfield_assigned_signed_enum : Warning<
+  "assigning value of preferred signed enum type %1 to unsigned bit-field %0; "
+  "negative enumerators of enum %1 will be converted to positive values">,
+  InGroup<PreferredTypeBitFieldEnumConversion>, DefaultIgnore;
+def warn_preferred_type_signed_bitfield_enum_conversion : Warning<
+  "signed bit-field %0 needs an extra bit to represent the largest positive "
+  "enumerators of preferred type %1">,
+  InGroup<PreferredTypeBitFieldEnumConversion>, DefaultError;
 def note_change_bitfield_sign : Note<
   "consider making the bit-field type %select{unsigned|signed}0">;
 def note_bitfield_preferred_type : Note<
-  "preferred type for bitfield %0 specified here"
+  "preferred type for bit-field %0 specified here"
 >;
-  "consider making the bit-field type %select{unsigned|signed}0">;
 
 def warn_missing_braces : Warning<
   "suggest braces around initialization of subobject">,
diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
@@ -10608,14 +10608,20 @@ static bool AnalyzeBitFieldAssignment(Sema &S, FieldDecl *Bitfield, Expr *Init,
       // on Windows where unfixed enums always use an underlying type of 'int'.
       unsigned DiagID = 0;
       if (SignedEnum && !SignedBitfield) {
-        DiagID = diag::warn_unsigned_bitfield_assigned_signed_enum;
+        DiagID =
+            PTAttr == nullptr
+                ? diag::warn_unsigned_bitfield_assigned_signed_enum
+                : diag::
+                      warn_preferred_type_unsigned_bitfield_assigned_signed_enum;
       } else if (SignedBitfield && !SignedEnum &&
                  ED->getNumPositiveBits() == FieldWidth) {
-        DiagID = diag::warn_signed_bitfield_enum_conversion;
+        DiagID =
+            PTAttr == nullptr
+                ? diag::warn_signed_bitfield_enum_conversion
+                : diag::warn_preferred_type_signed_bitfield_enum_conversion;
       }
-      unsigned PreferredTypeDiagIndex = PTAttr != nullptr;
       if (DiagID) {
-        S.Diag(InitLoc, DiagID) << Bitfield << PreferredTypeDiagIndex << ED;
+        S.Diag(InitLoc, DiagID) << Bitfield << ED;
         TypeSourceInfo *TSI = Bitfield->getTypeSourceInfo();
         SourceRange TypeRange =
             TSI ? TSI->getTypeLoc().getSourceRange() : SourceRange();
@@ -10636,8 +10642,11 @@ static bool AnalyzeBitFieldAssignment(Sema &S, FieldDecl *Bitfield, Expr *Init,
       // Check the bitwidth.
       if (BitsNeeded > FieldWidth) {
         Expr *WidthExpr = Bitfield->getBitWidth();
-        S.Diag(InitLoc, diag::warn_bitfield_too_small_for_enum)
-            << Bitfield << PreferredTypeDiagIndex << ED;
+        auto DiagID =
+            PTAttr == nullptr
+                ? diag::warn_bitfield_too_small_for_enum
+                : diag::warn_preferred_type_bitfield_too_small_for_enum;
+        S.Diag(InitLoc, DiagID) << Bitfield << ED;
         S.Diag(WidthExpr->getExprLoc(), diag::note_widen_bitfield)
             << BitsNeeded << ED << WidthExpr->getSourceRange();
         if (PTAttr)
diff --git a/clang/test/Sema/bitfield-preferred-type-sizing.c b/clang/test/Sema/bitfield-preferred-type-sizing.c
@@ -1,4 +1,6 @@
-// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -fsyntax-only -verify -std=c11 -Wno-unused-value -Wno-unused-but-set-variable -Wbitfield-width -Wbitfield-enum-conversion
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -fsyntax-only -verify=expected,preferrednotes -std=c11 -Wno-unused-value -Wno-unused-but-set-variable
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -fsyntax-only -verify=expected,bitfieldwarning,preferrednotes -std=c11 -Wno-unused-value -Wno-unused-but-set-variable -Wbitfield-width -Wbitfield-enum-conversion
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -fsyntax-only -verify=noerror,preferrednotes -std=c11 -Wno-unused-value -Wno-unused-but-set-variable -Wno-error=preferred-type-bitfield-enum-conversion -Wno-error=preferred-type-bitfield-width
 
 enum A {
   A_a,
@@ -40,21 +42,21 @@ void read_enum(struct S *s) {
 
 void write_enum(struct S *s, enum A x) {
   s->a1 = x;
-  // expected-warning@-1 {{bit-field 'a1' is not wide enough to store all enumerators of 'A'}}
-  // expected-note@#S_a1_decl {{widen this field to 2 bits to store all values of 'A'}}
+  // bitfieldwarning-warning@-1 {{bit-field 'a1' is not wide enough to store all enumerators of 'A'}}
+  // bitfieldwarning-note@#S_a1_decl {{widen this field to 2 bits to store all values of 'A'}}
   s->a2 = x;
   s->a3 = x;
   s->a4 = x;
-  // expected-warning@-1 {{bit-field 'a4' is not wide enough to store all enumerators of 'A'}}
-  // expected-note@#S_a4_decl {{widen this field to 2 bits to store all values of 'A'}}
+  // bitfieldwarning-warning@-1 {{bit-field 'a4' is not wide enough to store all enumerators of 'A'}}
+  // bitfieldwarning-note@#S_a4_decl {{widen this field to 2 bits to store all values of 'A'}}
   s->a5 = x;
   s->a6 = x;
   s->a7 = x;
-  // expected-warning@-1 {{bit-field 'a7' is not wide enough to store all enumerators of 'A'}}
-  // expected-note@#S_a7_decl {{widen this field to 2 bits to store all values of 'A'}}
+  // bitfieldwarning-warning@-1 {{bit-field 'a7' is not wide enough to store all enumerators of 'A'}}
+  // bitfieldwarning-note@#S_a7_decl {{widen this field to 2 bits to store all values of 'A'}}
   s->a8 = x;
-  // expected-warning@-1 {{signed bit-field 'a8' needs an extra bit to represent the largest positive enumerators of 'A'}}
-  // expected-note@#S_a8_decl {{consider making the bitfield type unsigned}}
+  // bitfieldwarning-warning@-1 {{signed bit-field 'a8' needs an extra bit to represent the largest positive enumerators of 'A'}}
+  // bitfieldwarning-note@#S_a8_decl {{consider making the bit-field type unsigned}}
   s->a9 = x;
 }
 
@@ -63,19 +65,22 @@ void write_enum_int(struct S *s, int x) {
   s->a2 = x;
   s->a3 = x;
   s->a4 = x;
-  // expected-warning@-1 {{bit-field 'a4' is not wide enough to store all enumerators of preferred type 'A'}}
-  // expected-note@#S_a4_decl {{widen this field to 2 bits to store all values of 'A'}}
-  // expected-note@#preferred_S_a4 {{preferred type for bitfield 'A' specified here}}
+  // expected-error@-1 {{bit-field 'a4' is not wide enough to store all enumerators of preferred type 'A'}}
+  // noerror-warning@-2 {{bit-field 'a4' is not wide enough to store all enumerators of preferred type 'A'}}
+  // preferrednotes-note@#S_a4_decl {{widen this field to 2 bits to store all values of 'A'}}
+  // preferrednotes-note@#preferred_S_a4 {{preferred type for bit-field 'A' specified here}}
   s->a5 = x;
   s->a6 = x;
   s->a7 = x;
-  // expected-warning@-1 {{bit-field 'a7' is not wide enough to store all enumerators of preferred type 'A'}}
-  // expected-note@#S_a7_decl {{widen this field to 2 bits to store all values of 'A'}}
-  // expected-note@#preferred_S_a7 {{preferred type for bitfield 'A' specified here}}
+  // expected-error@-1 {{bit-field 'a7' is not wide enough to store all enumerators of preferred type 'A'}}
+  // noerror-warning@-2 {{bit-field 'a7' is not wide enough to store all enumerators of preferred type 'A'}}
+  // preferrednotes-note@#S_a7_decl {{widen this field to 2 bits to store all values of 'A'}}
+  // preferrednotes-note@#preferred_S_a7 {{preferred type for bit-field 'A' specified here}}
   s->a8 = x;
-  // expected-warning@-1 {{signed bit-field 'a8' needs an extra bit to represent the largest positive enumerators of preferred type 'A'}}
-  // expected-note@#S_a8_decl {{consider making the bitfield type unsigned}}
-  // expected-note@#preferred_S_a8 {{preferred type for bitfield 'A' specified here}}
+  // expected-error@-1 {{signed bit-field 'a8' needs an extra bit to represent the largest positive enumerators of preferred type 'A'}}
+  // noerror-warning@-2 {{signed bit-field 'a8' needs an extra bit to represent the largest positive enumerators of preferred type 'A'}}
+  // preferrednotes-note@#S_a8_decl {{consider making the bit-field type unsigned}}
+  // preferrednotes-note@#preferred_S_a8 {{preferred type for bit-field 'A' specified here}}
   s->a9 = x;
 }
 
@@ -93,16 +98,16 @@ void write_low_constant(struct S *s) {
 
 void write_high_constant(struct S *s) {
   s->a1 = A_d;
-  // expected-warning@-1 {{implicit truncation from 'int' to bit-field changes value from 3 to 1}}
+  // preferrednotes-warning@-1 {{implicit truncation from 'int' to bit-field changes value from 3 to 1}}
   s->a2 = A_d;
   s->a3 = A_d;
   s->a4 = A_d;
-  // expected-warning@-1 {{implicit truncation from 'int' to bit-field changes value from 3 to 1}}
+  // preferrednotes-warning@-1 {{implicit truncation from 'int' to bit-field changes value from 3 to 1}}
   s->a5 = A_d;
   s->a6 = A_d;
   s->a7 = A_d;
-  // expected-warning@-1 {{implicit truncation from 'int' to bit-field changes value from 3 to -1}}
+  // preferrednotes-warning@-1 {{implicit truncation from 'int' to bit-field changes value from 3 to -1}}
   s->a8 = A_d;
-  // expected-warning@-1 {{implicit truncation from 'int' to bit-field changes value from 3 to -1}}
+  // preferrednotes-warning@-1 {{implicit truncation from 'int' to bit-field changes value from 3 to -1}}
   s->a9 = A_d;
 };
diff --git a/clang/test/SemaCXX/bitfield-preferred-type-sizing.cpp b/clang/test/SemaCXX/bitfield-preferred-type-sizing.cpp
