re PR c++/47301 ([C++0x] ICE: in fold_convert_loc, at fold-const.c:1906 with -fabi...

	PR c++/47301
	* decl.c (compute_array_index_type): Don't bother trying to deal
	with literal classes in ABI v1.

From-SVN: r171085

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 66c831658353e48e29b2bb7bc106e8afe3ef370f..d96b4b3e31792212f9b12e7d0e4c5fd2aaa57317 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2011-03-16  Jason Merrill  <jason@redhat.com>
 
+       PR c++/47301
+       * decl.c (compute_array_index_type): Don't bother trying to deal
+       with literal classes in ABI v1.
+
        PR c++/46336
        * decl.c (duplicate_decls): Return NULL_TREE for clashing
        C functions.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 17b316381ec0225731617d7f1b0792f9dea2dae7..a7da5742a5e2669dc39c58ddff7ca1a0e97d812f 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7525,6 +7525,9 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain)
              if (size == error_mark_node)
                return error_mark_node;
              type = TREE_TYPE (size);
+             /* We didn't support this case in GCC 3.2, so don't bother
+                trying to model it now in ABI v1.  */
+             abi_1_itype = error_mark_node;
            }
 
          size = maybe_constant_value (size);
@@ -7569,7 +7572,8 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain)
       return itype;
     }
   
-  if (!abi_version_at_least (2) && processing_template_decl)
+  if (!abi_version_at_least (2) && processing_template_decl
+      && abi_1_itype == NULL_TREE)
     /* For abi-1, we handled all instances in templates the same way,
        even when they were non-dependent. This affects the manglings
        produced.  So, we do the normal checking for non-dependent
@@ -7683,7 +7687,7 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain)
     }
 
   /* Create and return the appropriate index type.  */
-  if (abi_1_itype)
+  if (abi_1_itype && abi_1_itype != error_mark_node)
     {
       tree t = build_index_type (itype);
       TYPE_CANONICAL (abi_1_itype) = TYPE_CANONICAL (t);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 122beef0b1a43c3667387e2ba64e3b87e1d586a6..bf17d3d7e5dbc01803f550bfb89e9c915afef4b3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-16  Jason Merrill  <jason@redhat.com>
 
+       * g++.dg/cpp0x/constexpr-abi1.C: New.
+
        * g++.dg/cpp0x/constexpr-46336.C: New.
        * g++.dg/parse/friend5.C: Adjust expected errors.
 

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-abi1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-abi1.C
new file mode 100644 (file)
index 0000000..e83f142
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-abi1.C
@@ -0,0 +1,16 @@
+// PR c++/47301
+// { dg-options "-std=c++0x -fabi-version=1" }
+
+struct A
+{
+  constexpr operator int ()
+  {
+    return 1;
+  }
+};
+
+template < int > struct B
+{
+  static constexpr A a = A();
+  int ar[a];
+};