From b52114d28357b7616e6c5d25cffd25a0799b2682 Mon Sep 17 00:00:00 2001 From: Geoffrey Keating Date: Thu, 9 Nov 2000 21:29:54 +0000 Subject: [PATCH] In gcc/: 2000-11-09 Geoffrey Keating In gcc/: 2000-11-09 Geoffrey Keating * c-decl.c (finish_struct): When a structure is completed, check all its variant types for completeness. In gcc/testsuite/: 2000-11-09 Geoffrey Keating * gcc.c-torture/compile/20001109-1.c: New test. * gcc.c-torture/compile/20001109-2.c: New test. From-SVN: r37346 --- gcc/ChangeLog | 5 +++++ gcc/c-decl.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.c-torture/compile/20001109-1.c | 7 +++++++ gcc/testsuite/gcc.c-torture/compile/20001109-2.c | 6 ++++++ 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/20001109-1.c create mode 100644 gcc/testsuite/gcc.c-torture/compile/20001109-2.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3db1d11ed18..03d1ac60145 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2000-11-09 Geoffrey Keating + + * c-decl.c (finish_struct): When a structure is completed, + check all its variant types for completeness. + 2000-11-09 Neil Booth * cpphash.c: Move cpp_defined here from cpplib.c. diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 2bbfd4613ce..c1093ceecb9 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -5573,7 +5573,7 @@ finish_struct (t, fieldlist, attributes) tree decl; for (decl = current_binding_level->names; decl; decl = TREE_CHAIN (decl)) { - if (TREE_TYPE (decl) == t + if (TYPE_MAIN_VARIANT (TREE_TYPE (decl)) == TYPE_MAIN_VARIANT (t) && TREE_CODE (decl) != TYPE_DECL) { layout_decl (decl, 0); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 21802344458..4a45c4f9771 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2000-11-09 Geoffrey Keating + + * gcc.c-torture/compile/20001109-1.c: New test. + * gcc.c-torture/compile/20001109-2.c: New test. + 2000-11-09 Nathan Sidwell * g++.old-deja/g++.pt/operator1.C: New test. diff --git a/gcc/testsuite/gcc.c-torture/compile/20001109-1.c b/gcc/testsuite/gcc.c-torture/compile/20001109-1.c new file mode 100644 index 00000000000..cce8047ae8a --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20001109-1.c @@ -0,0 +1,7 @@ +typedef struct _foo foo; +extern foo bar; +struct _foo { + int a; +}; + +int tst[__alignof__ (bar) >= __alignof__ (int) ? 1 : -1]; diff --git a/gcc/testsuite/gcc.c-torture/compile/20001109-2.c b/gcc/testsuite/gcc.c-torture/compile/20001109-2.c new file mode 100644 index 00000000000..a23e56bd34b --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20001109-2.c @@ -0,0 +1,6 @@ +extern struct foo bar; +struct foo { + int a; +}; + +int tst[__alignof__ (bar) >= __alignof__ (int) ? 1 : -1]; -- 2.30.2