]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
backport: re PR c++/71516 (ICE on invalid C++ code (invalid use of forward declared...
authorJakub Jelinek <jakub@redhat.com>
Thu, 7 Jul 2016 12:44:33 +0000 (14:44 +0200)
committerJakub Jelinek <jakub@gcc.gnu.org>
Thu, 7 Jul 2016 12:44:33 +0000 (14:44 +0200)
Backported from mainline
2016-06-14  Jakub Jelinek  <jakub@redhat.com>

PR c++/71516
* decl.c (complete_vars): Handle gracefully type == error_mark_node.

* g++.dg/init/pr71516.C: New test.

From-SVN: r238097

gcc/cp/ChangeLog
gcc/cp/decl.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/init/pr71516.C [new file with mode: 0644]

index 06fb12a37112ce9375ebbd4966ac9fcb08dbcace..4529d1f77b7d1a9f9d1c57db98d9be328cc29b1f 100644 (file)
@@ -1,3 +1,11 @@
+2016-07-07  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2016-06-14  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/71516
+       * decl.c (complete_vars): Handle gracefully type == error_mark_node.
+
 2016-06-08  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/71442
index 3d68b637bca637022978987526912477752df67f..c1747d6ad866f2e818242c391a00fa00b42c686e 100644 (file)
@@ -14561,8 +14561,9 @@ complete_vars (tree type)
          tree var = iv->decl;
          tree type = TREE_TYPE (var);
 
-         if (TYPE_MAIN_VARIANT (strip_array_types (type))
-             == iv->incomplete_type)
+         if (type != error_mark_node
+             && (TYPE_MAIN_VARIANT (strip_array_types (type))
+                 == iv->incomplete_type))
            {
              /* Complete the type of the variable.  The VAR_DECL itself
                 will be laid out in expand_expr.  */
index 113f180c33c056254f594b6f93965bd2240f4a96..59bbf239b20b1c607ed00d080773797c89cfbbc9 100644 (file)
@@ -1,6 +1,11 @@
 2016-07-07  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2016-06-14  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/71516
+       * g++.dg/init/pr71516.C: New test.
+
        2016-06-10  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/71494
diff --git a/gcc/testsuite/g++.dg/init/pr71516.C b/gcc/testsuite/g++.dg/init/pr71516.C
new file mode 100644 (file)
index 0000000..0b9aec4
--- /dev/null
@@ -0,0 +1,10 @@
+// PR c++/71516
+// { dg-do compile }
+
+struct A;      // { dg-message "forward declaration of" }
+struct B
+{ 
+  static A a;
+};
+A B::a = A();  // { dg-error "has initializer but incomplete type|invalid use of incomplete type" }
+struct A {};