public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Jason Merrill <jason@redhat.com>
To: gcc-patches List <gcc-patches@gcc.gnu.org>
Subject: C++ PATCH for testsuite failures with -std=c++17
Date: Tue, 09 May 2017 20:42:00 -0000	[thread overview]
Message-ID: <CADzB+2n9u7aqAne0Wp-M3qy4i53X5o6iCPjWF7UVnwKcjTOW5g@mail.gmail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

For C++17 aggregate bases, we have started adding base fields for
empty bases.  The code for calculating whether a class is standard
layout needs to ignore these.

The C++17 mode diagnostic for direct-enum-init1.C was incorrect.

Tested x86_64-pc-linux-gnu, applying to trunk.

[-- Attachment #2: 1z-regr.diff --]
[-- Type: text/plain, Size: 2937 bytes --]

commit 9a612cc30d4b3ef905ce45304545d8b99a3cf5b9
Author: Jason Merrill <jason@redhat.com>
Date:   Tue May 9 14:15:38 2017 -0400

            * class.c (check_bases): Ignore empty bases.

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index fc71766..085dbc3 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -1860,7 +1860,9 @@ check_bases (tree t,
 	       members */
 	    for (basefield = TYPE_FIELDS (basetype); basefield;
 		 basefield = DECL_CHAIN (basefield))
-	      if (TREE_CODE (basefield) == FIELD_DECL)
+	      if (TREE_CODE (basefield) == FIELD_DECL
+		  && DECL_SIZE (basefield)
+		  && !integer_zerop (DECL_SIZE (basefield)))
 		{
 		  if (field)
 		    CLASSTYPE_NON_STD_LAYOUT (t) = 1;
diff --git a/gcc/testsuite/g++.dg/ext/is_std_layout1.C b/gcc/testsuite/g++.dg/ext/is_std_layout1.C
new file mode 100644
index 0000000..007c94a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_std_layout1.C
@@ -0,0 +1,12 @@
+// { dg-do compile { target c++11 } }
+
+template <int> struct E { };
+
+struct E1: E<0>, E<1> { };
+struct E2: E<2>, E<3> { };
+
+struct A1x { int n; };
+struct D2: A1x, E1, E2 { };
+
+#define SA(X) static_assert((X),#X)
+SA(__is_standard_layout (D2));

commit 90bdd7df4aa641d53edacd20414d724babfe4af8
Author: Jason Merrill <jason@redhat.com>
Date:   Tue May 9 13:51:07 2017 -0400

            * g++.dg/cpp1z/direct-enum-init1.C: Correct error message.

diff --git a/gcc/testsuite/g++.dg/cpp1z/direct-enum-init1.C b/gcc/testsuite/g++.dg/cpp1z/direct-enum-init1.C
index a17473f..11269cc 100644
--- a/gcc/testsuite/g++.dg/cpp1z/direct-enum-init1.C
+++ b/gcc/testsuite/g++.dg/cpp1z/direct-enum-init1.C
@@ -22,7 +22,7 @@ foo ()
   C c1 { s };
   D d1 { D(t) };	// { dg-error "invalid cast from type 'T' to type 'D {enum}'" }
   D d2 { t };		// { dg-error "cannot convert 'T' to 'D {enum}' in initialization" "" { target c++14_down } }
-			// { dg-error "invalid cast from type 'T' to type 'D'" "" { target c++1z } .-1 }
+			// { dg-error "invalid cast from type 'T' to type 'D {enum}'" "" { target c++1z } .-1 }
   D d3 { 9 };		// { dg-error "cannot convert 'int' to 'D {enum}' in initialization" "" { target c++14_down } }
   D d4 { l };		// { dg-error "cannot convert 'long int' to 'D {enum}' in initialization" "" { target c++14_down } }
   D d5 { D(l) };
@@ -89,7 +89,7 @@ foo2 ()
   C c1 { s };
   D d1 { D(t) };	// { dg-error "invalid cast from type 'T' to type 'D {enum}'" }
   D d2 { t };		// { dg-error "cannot convert 'T' to 'D {enum}' in initialization" "" { target c++14_down } }
-			// { dg-error "invalid cast from type 'T' to type 'D'" "" { target c++1z } .-1 }
+			// { dg-error "invalid cast from type 'T' to type 'D {enum}'" "" { target c++1z } .-1 }
   D d3 { 9 };		// { dg-error "cannot convert 'int' to 'D {enum}' in initialization" "" { target c++14_down } }
   D d4 { l };		// { dg-error "cannot convert 'long int' to 'D {enum}' in initialization" "" { target c++14_down } }
   D d5 { D(l) };

             reply	other threads:[~2017-05-09 20:37 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-09 20:42 Jason Merrill [this message]
2017-05-25  9:08 ` Jakub Jelinek
2017-05-25  9:23   ` Jakub Jelinek
2017-05-25 21:57     ` Jason Merrill

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CADzB+2n9u7aqAne0Wp-M3qy4i53X5o6iCPjWF7UVnwKcjTOW5g@mail.gmail.com \
    --to=jason@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).