[PATCH] D56879: [Sema] Suppress a warning about a forward-declared fixed enum in C mode

[Erik Pilkington via Phabricator via cfe-commits]

erik.pilkington updated this revision to Diff 182548.
erik.pilkington marked an inline comment as done.
erik.pilkington added a comment.

Add a `-pedantic` RUN line.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D56879/new/

https://reviews.llvm.org/D56879

Files:
  clang/lib/Sema/SemaDecl.cpp
  clang/test/Sema/fixed-enum.c


Index: clang/test/Sema/fixed-enum.c
===================================================================
--- clang/test/Sema/fixed-enum.c
+++ clang/test/Sema/fixed-enum.c
@@ -2,6 +2,7 @@
 // RUN: %clang_cc1 -Weverything -xc++ -std=c++03 -DCXX03 -verify %s
 // RUN: %clang_cc1 -Weverything -xobjective-c -DOBJC -verify %s
 // RUN: %clang_cc1 -Weverything -std=c11 -xc -DC11 -verify %s
+// RUN: %clang_cc1 -pedantic    -std=c11 -xc -DC11 -verify %s
 // RUN: %clang_cc1 -Weverything -std=c11 -xc -fms-extensions -DMS -verify %s
 
 enum X : int {e};
@@ -10,9 +11,29 @@
 #elif defined(CXX03)
 // expected-warning at -4{{enumeration types with a fixed underlying type are a C++11 extension}}
 #elif defined(OBJC)
-// expected-no-diagnostics
+// No diagnostic
 #elif defined(C11)
 // expected-warning at -8{{enumeration types with a fixed underlying type are a Clang extension}}
 #elif defined(MS)
 // expected-warning at -10{{enumeration types with a fixed underlying type are a Microsoft extension}}
 #endif
+
+// Don't warn about the forward declaration in any language mode.
+enum Fwd : int;
+enum Fwd : int { e2 };
+#ifndef OBJC
+// expected-warning at -3 {{enumeration types with a fixed underlying type}}
+// expected-warning at -3 {{enumeration types with a fixed underlying type}}
+#endif
+
+// Always error on the incompatible redeclaration.
+enum BadFwd : int;
+#ifndef OBJC
+// expected-warning at -2 {{enumeration types with a fixed underlying type}}
+#endif
+// expected-note at -4 {{previous declaration is here}}
+enum BadFwd : char { e3 };
+#ifndef OBJC
+// expected-warning at -2 {{enumeration types with a fixed underlying type}}
+#endif
+// expected-error at -4 {{enumeration redeclared with different underlying type 'char' (was 'int')}}
Index: clang/lib/Sema/SemaDecl.cpp
===================================================================
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -14743,8 +14743,7 @@
     // If this is an undefined enum, warn.
     if (TUK != TUK_Definition && !Invalid) {
       TagDecl *Def;
-      if (IsFixed && (getLangOpts().CPlusPlus11 || getLangOpts().ObjC) &&
-          cast<EnumDecl>(New)->isFixed()) {
+      if (IsFixed && cast<EnumDecl>(New)->isFixed()) {
         // C++0x: 7.2p2: opaque-enum-declaration.
         // Conflicts are diagnosed above. Do nothing.
       }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D56879.182548.patch
Type: text/x-patch
Size: 2317 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20190118/00b6f2ba/attachment-0001.bin>