* c-common.c (flag_ms_extensions): Move from c++ front end.

        * c-common.h (flag_ms_extensions): Declare.
        * c-decl.c (c_decode_option): Add -fms-extensions.
        (grokfield): Don't accept anonymous structures in ISO C mode;
        accept only unnamed anonymous structures in GNU C mode; accept
        Plan 9 extensions in MS mode.
        * c-parse.in (SAVE_EXT_FLAGS, RESTORE_EXT_FLAGS): Rename from
        SAVE/RESTORE_WARN_FLAGS; add flag_iso frobbing; update all callers.
        (extension): Clear flag_iso.
        * doc/invoke.texi (C Dialect Options): Add -fms-extensions.

        * cp-tree.h, decl2.c (flag_ms_extensions): Move to c-common.

        * g++.dg/ext/anon-struct1.C: New.
        * g++.dg/ext/anon-struct2.C: New.
        * g++.dg/ext/anon-struct3.C: New.
        * gcc.dg/anon-struct-1.c: New.
        * gcc.dg/anon-struct-2.c: New.
        * gcc.dg/anon-struct-3.c: New.
        * gcc.dg/20011008-1.c: Adjust warning text.
        * gcc.dg/20020527-1.c: Add -fms-extensions.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54670 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 138 insertions, 2 deletions

diff --git a/gcc/testsuite/gcc.dg/20011008-1.c b/gcc/testsuite/gcc.dg/20011008-1.c
index 5ac821cb2f0..e5c9e2cf0ee 100644
--- a/gcc/testsuite/gcc.dg/20011008-1.c
+++ b/gcc/testsuite/gcc.dg/20011008-1.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O0" } */
 
-struct { int; int q; } a; /* { dg-error "unnamed" } */
+struct { int; int q; } a; /* { dg-warning "does not declare anything" } */
 struct { union {int x;}; int q; } b;
 struct { struct {int x;}; int q; } c;
 union { union {int x;}; int q; } d;
diff --git a/gcc/testsuite/gcc.dg/20020527-1.c b/gcc/testsuite/gcc.dg/20020527-1.c
index f480d7b7bb8..6f963ed9f78 100644
--- a/gcc/testsuite/gcc.dg/20020527-1.c
+++ b/gcc/testsuite/gcc.dg/20020527-1.c
@@ -2,7 +2,7 @@
    Test whether an unnamed field with user defined type - struct or union is
    accepted.  */
 /* { dg-do compile } */
-/* { dg-options "" } */
+/* { dg-options "-fms-extensions" } */
 
 typedef struct {
   unsigned short a;
diff --git a/gcc/testsuite/gcc.dg/anon-struct-1.c b/gcc/testsuite/gcc.dg/anon-struct-1.c
new file mode 100644
index 00000000000..587d59d7220
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/anon-struct-1.c
@@ -0,0 +1,56 @@
+/* { dg-options "-std=iso9899:1990" } */
+/* In strict ISO C mode, we don't recognize the anonymous struct/union
+   extension or any Microsoft extensions.  */
+
+struct A { char a; };
+
+/* MS extension.  */
+struct B {
+  struct A;			/* { dg-warning "does not declare anything" } */
+  char b;
+};
+char testB[sizeof(struct B) == sizeof(struct A) ? 1 : -1];
+
+/* MS extension.  */
+struct C {
+  struct D { char d; };		/* { dg-warning "does not declare anything" } */
+  char c;
+};
+char testC[sizeof(struct C) == sizeof(struct A) ? 1 : -1];
+char testD[sizeof(struct D) == sizeof(struct A) ? 1 : -1];
+
+/* GNU extension.  */
+struct E {
+  struct { char z; };		/* { dg-warning "does not declare anything" } */
+  char e;
+};
+char testE[sizeof(struct E) == sizeof(struct A) ? 1 : -1];
+
+/* MS extension.  */
+typedef struct A typedef_A;
+struct F {
+  typedef_A;			/* { dg-warning "does not declare anything" } */
+  char f;
+};
+char testF[sizeof(struct F) == sizeof(struct A) ? 1 : -1];
+
+/* __extension__ enables GNU C mode for the duration of the declaration.  */
+__extension__ struct G {
+  struct { char z; };
+  char g;
+};
+char testG[sizeof(struct G) == 2 * sizeof(struct A) ? 1 : -1];
+
+struct H {
+  __extension__ struct { char z; };
+  char h;
+};
+char testH[sizeof(struct H) == 2 * sizeof(struct A) ? 1 : -1];
+
+/* Make sure __extension__ gets turned back off.  */
+struct I {
+  struct { char z; };		/* { dg-warning "does not declare anything" } */
+  char i;
+};
+char testI[sizeof(struct I) == sizeof(struct A) ? 1 : -1];
+
diff --git a/gcc/testsuite/gcc.dg/anon-struct-2.c b/gcc/testsuite/gcc.dg/anon-struct-2.c
new file mode 100644
index 00000000000..4bd2d0f337c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/anon-struct-2.c
@@ -0,0 +1,48 @@
+/* { dg-options "-std=gnu89" } */
+/* In GNU C mode, we recognize the anonymous struct/union extension,
+   but not Microsoft extensions.  */
+
+struct A { char a; };
+
+/* MS extension.  */
+struct B {
+  struct A;			/* { dg-warning "does not declare anything" } */
+  char b;
+};
+char testB[sizeof(struct B) == sizeof(struct A) ? 1 : -1];
+
+/* MS extension.  */
+struct C {
+  struct D { char d; };		/* { dg-warning "does not declare anything" } */
+  char c;
+};
+char testC[sizeof(struct C) == sizeof(struct A) ? 1 : -1];
+char testD[sizeof(struct D) == sizeof(struct A) ? 1 : -1];
+
+/* GNU extension.  */
+struct E {
+  struct { char z; };
+  char e;
+};
+char testE[sizeof(struct E) == 2 * sizeof(struct A) ? 1 : -1];
+
+/* MS extension.  */
+typedef struct A typedef_A;
+struct F {
+  typedef_A;			/* { dg-warning "does not declare anything" } */
+  char f;
+};
+char testF[sizeof(struct F) == sizeof(struct A) ? 1 : -1];
+
+/* Test that __extension__ does the right thing coming _from_ GNU C mode.  */
+__extension__ struct G {
+  struct { char z; };
+  char g;
+};
+char testG[sizeof(struct G) == 2 * sizeof(struct A) ? 1 : -1];
+
+struct H {
+  struct { char z; };
+  char h;
+};
+char testH[sizeof(struct H) == 2 * sizeof(struct A) ? 1 : -1];
diff --git a/gcc/testsuite/gcc.dg/anon-struct-3.c b/gcc/testsuite/gcc.dg/anon-struct-3.c
new file mode 100644
index 00000000000..3ed6e672bd5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/anon-struct-3.c
@@ -0,0 +1,32 @@
+/* { dg-options "-std=gnu89 -fms-extensions" } */
+/* Enabling Microsoft mode makes all of the tests equivalent.  Checked vs
+   Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
+ */
+
+struct A { char a; };
+
+struct B {
+  struct A;
+  char b;
+};
+char testB[sizeof(struct B) == 2 * sizeof(struct A) ? 1 : -1];
+
+struct C {
+  struct D { char d; };
+  char c;
+};
+char testC[sizeof(struct C) == 2 * sizeof(struct A) ? 1 : -1];
+char testD[sizeof(struct D) == sizeof(struct A) ? 1 : -1];
+
+struct E {
+  struct { char z; };
+  char e;
+};
+char testE[sizeof(struct E) == 2 * sizeof(struct A) ? 1 : -1];
+
+typedef struct A typedef_A;
+struct F {
+  typedef_A;
+  char f;
+};
+char testF[sizeof(struct F) == 2 * sizeof(struct A) ? 1 : -1];