re PR c++/92015 (internal compiler error: in cxx_eval_array_reference, at cp/constexp...

	PR c++/92015
	* constexpr.c (cxx_eval_component_reference, cxx_eval_bit_field_ref):
	Use STRIP_ANY_LOCATION_WRAPPER on CONSTRUCTOR elts.

	* g++.dg/cpp0x/constexpr-92015.C: New test.

From-SVN: r277267

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f861fb3e343c96e5a5f67bf536d284ec8d88da78..593510ffbf392d5fcf18f4602764ba508f7bd3b5 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-21  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/92015
+       * constexpr.c (cxx_eval_component_reference, cxx_eval_bit_field_ref):
+       Use STRIP_ANY_LOCATION_WRAPPER on CONSTRUCTOR elts.
+
 2019-10-21  Marek Polacek  <polacek@redhat.com>
 
        PR c++/92062 - ODR-use ignored for static member of class template.

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 46d41ecb984cfc894879277b039d4e1a667c95b6..60d4b9ad0248807d84993db652eb9ea2ed36b3aa 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -2887,7 +2887,10 @@ cxx_eval_component_reference (const constexpr_ctx *ctx, tree t,
          : field == part)
        {
          if (value)
-           return value;
+           {
+             STRIP_ANY_LOCATION_WRAPPER (value);
+             return value;
+           }
          else
            /* We're in the middle of initializing it.  */
            break;
@@ -2977,6 +2980,7 @@ cxx_eval_bit_field_ref (const constexpr_ctx *ctx, tree t,
   FOR_EACH_CONSTRUCTOR_ELT (CONSTRUCTOR_ELTS (whole), i, field, value)
     {
       tree bitpos = bit_position (field);
+      STRIP_ANY_LOCATION_WRAPPER (value);
       if (bitpos == start && DECL_SIZE (field) == TREE_OPERAND (t, 1))
        return value;
       if (TREE_CODE (TREE_TYPE (field)) == INTEGER_TYPE

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ba280a1beaff709c7158077f013c4cfe21d618b6..3f4e6c5c8806c0da197f88319f83ab1a048ca695 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-21  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/92015
+       * g++.dg/cpp0x/constexpr-92015.C: New test.
+
 2019-10-21  Marek Polacek  <polacek@redhat.com>
 
        PR c++/92062 - ODR-use ignored for static member of class template.

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-92015.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-92015.C
new file mode 100644 (file)
index 0000000..60f288e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-92015.C
@@ -0,0 +1,7 @@
+// PR c++/92015
+// { dg-do compile { target c++11 } }
+
+struct S1 { char c[6] {'h', 'e', 'l', 'l', 'o', 0}; };
+struct S2 { char c[6] = "hello"; };
+static_assert (S1{}.c[0] == 'h', "");
+static_assert (S2{}.c[0] == 'h', "");