re PR c++/79821 (SEGV in cc1plus compiling 64-bit stdc++.h.gch/O2g.gch)

	PR c++/79821
	* dwarf2out.h (dw_vec_const): Change array type from unsigned char *
	to void * for PCH reasons.
	* dwarf2out.c (output_loc_operands, output_die): Cast
	v.val_vec.array to unsigned char *.

From-SVN: r245932

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bd424cbdf58821e1d0f55d23419149627b491289..feedbaf1b3d18ac72aa46b0b04a7d57f6689d066 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-03-06  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/79821
+       * dwarf2out.h (dw_vec_const): Change array type from unsigned char *
+       to void * for PCH reasons.
+       * dwarf2out.c (output_loc_operands, output_die): Cast
+       v.val_vec.array to unsigned char *.
+
 2017-03-06  John David Anglin  <danglin@gcc.gnu.org>
 
        PR target 77850

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 87060a33804e88093941eac501e1da5c0fa7d1b9..0bbb90ed3aa19a61548532f315cb1ec3e1f52245 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -2020,7 +2020,7 @@ output_loc_operands (dw_loc_descr_ref loc, int for_eh_or_skip)
                elt_size /= 2;
                len *= 2;
              }
-           for (i = 0, p = val2->v.val_vec.array;
+           for (i = 0, p = (unsigned char *) val2->v.val_vec.array;
                 i < len;
                 i++, p += elt_size)
              dw2_asm_output_data (elt_size, extract_int (p, elt_size),
@@ -2273,7 +2273,7 @@ output_loc_operands (dw_loc_descr_ref loc, int for_eh_or_skip)
                  elt_size /= 2;
                  len *= 2;
                }
-             for (i = 0, p = val2->v.val_vec.array;
+             for (i = 0, p = (unsigned char *) val2->v.val_vec.array;
                   i < len;
                   i++, p += elt_size)
                dw2_asm_output_data (elt_size, extract_int (p, elt_size),
@@ -10105,7 +10105,7 @@ output_die (dw_die_ref die)
                elt_size /= 2;
                len *= 2;
              }
-           for (i = 0, p = a->dw_attr_val.v.val_vec.array;
+           for (i = 0, p = (unsigned char *) a->dw_attr_val.v.val_vec.array;
                 i < len;
                 i++, p += elt_size)
              dw2_asm_output_data (elt_size, extract_int (p, elt_size),

diff --git a/gcc/dwarf2out.h b/gcc/dwarf2out.h
index 79dc4391753ecffcb7eeedc4f8582c4d40412a30..940247316d39242189cc9deb2b1819bb3d9f9c99 100644 (file)
--- a/gcc/dwarf2out.h
+++ b/gcc/dwarf2out.h
@@ -163,7 +163,7 @@ enum dw_val_class
 /* Describe a floating point constant value, or a vector constant value.  */
 
 struct GTY(()) dw_vec_const {
-  unsigned char * GTY((atomic)) array;
+  void * GTY((atomic)) array;
   unsigned length;
   unsigned elt_size;
 };