aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@gcc.gnu.org>2014-02-11 18:46:34 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2014-02-11 18:46:34 +0100
commit8268ad5cb2fb8638e3609e1f9621ee12869d167a (patch)
tree6798c5e3a45611f3b22b754d7a6285464e38bec8
parente332c729c1952c0146cfa48042267ac735905b23 (diff)
downloadgcc-8268ad5cb2fb8638e3609e1f9621ee12869d167a.zip
gcc-8268ad5cb2fb8638e3609e1f9621ee12869d167a.tar.gz
gcc-8268ad5cb2fb8638e3609e1f9621ee12869d167a.tar.bz2
re PR middle-end/59776 (gcc -g -O1 ICE in expand_debug_locations, at cfgexpand.c:3865)
PR debug/59776 * tree-sra.c (load_assign_lhs_subreplacements): Add VIEW_CONVERT_EXPR around drhs if type conversion to lacc->type is not useless. * gcc.dg/guality/pr59776.c: New test. From-SVN: r207695
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/guality/pr59776.c29
-rw-r--r--gcc/tree-sra.c4
4 files changed, 45 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f29f943..2d5a09c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-11 Richard Henderson <rth@redhat.com>
+ Jakub Jelinek <jakub@redhat.com>
+
+ PR debug/59776
+ * tree-sra.c (load_assign_lhs_subreplacements): Add VIEW_CONVERT_EXPR
+ around drhs if type conversion to lacc->type is not useless.
+
2014-02-11 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* config/aarch64/aarch64-cores.def (cortex-a57): Use cortexa57
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c287b8d..b25b15e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-11 Jakub Jelinek <jakub@redhat.com>
+
+ PR debug/59776
+ * gcc.dg/guality/pr59776.c: New test.
+
2014-02-11 Renlin Li <Renlin.Li@arm.com>
* gcc.target/arm/fixed_float_conversion.c: Add arm_vfp3 option.
diff --git a/gcc/testsuite/gcc.dg/guality/pr59776.c b/gcc/testsuite/gcc.dg/guality/pr59776.c
new file mode 100644
index 0000000..382abb6
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/guality/pr59776.c
@@ -0,0 +1,29 @@
+/* PR debug/59776 */
+/* { dg-do run } */
+/* { dg-options "-g" } */
+
+#include "../nop.h"
+
+struct S { float f, g; };
+
+__attribute__((noinline, noclone)) void
+foo (struct S *p)
+{
+ struct S s1, s2; /* { dg-final { gdb-test pr59776.c:17 "s1.f" "5.0" } } */
+ s1 = *p; /* { dg-final { gdb-test pr59776.c:17 "s1.g" "6.0" } } */
+ s2 = s1; /* { dg-final { gdb-test pr59776.c:17 "s2.f" "0.0" } } */
+ *(int *) &s2.f = 0; /* { dg-final { gdb-test pr59776.c:17 "s2.g" "6.0" } } */
+ asm volatile (NOP : : : "memory"); /* { dg-final { gdb-test pr59776.c:20 "s1.f" "5.0" } } */
+ asm volatile (NOP : : : "memory"); /* { dg-final { gdb-test pr59776.c:20 "s1.g" "6.0" } } */
+ s2 = s1; /* { dg-final { gdb-test pr59776.c:20 "s2.f" "5.0" } } */
+ asm volatile (NOP : : : "memory"); /* { dg-final { gdb-test pr59776.c:20 "s2.g" "6.0" } } */
+ asm volatile (NOP : : : "memory");
+}
+
+int
+main ()
+{
+ struct S x = { 5.0f, 6.0f };
+ foo (&x);
+ return 0;
+}
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 4071274..284d544 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -2950,6 +2950,10 @@ load_assign_lhs_subreplacements (struct access *lacc, struct access *top_racc,
lacc);
else
drhs = NULL_TREE;
+ if (drhs
+ && !useless_type_conversion_p (lacc->type, TREE_TYPE (drhs)))
+ drhs = fold_build1_loc (loc, VIEW_CONVERT_EXPR,
+ lacc->type, drhs);
ds = gimple_build_debug_bind (get_access_replacement (lacc),
drhs, gsi_stmt (*old_gsi));
gsi_insert_after (new_gsi, ds, GSI_NEW_STMT);