From 6d8f280f7a76c5b008d0109762f7fb316fc86fd3 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 15 Nov 2008 17:40:24 +0100 Subject: [PATCH] re PR target/38123 (error: incorrect sharing of tree nodes ap->fp_offset = D.2748;) PR target/38123 * config/i386/i386.c (ix86_gimplify_va_arg): Don't share valist between gpr and other COMPONENT_REFs. * gcc.c-torture/compile/pr38123.c: New test. From-SVN: r141889 --- gcc/ChangeLog | 6 ++++++ gcc/config/i386/i386.c | 3 ++- gcc/testsuite/ChangeLog | 7 ++++++- gcc/testsuite/gcc.c-torture/compile/pr38123.c | 13 +++++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr38123.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2e34022..ea83a9e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-11-15 Jakub Jelinek + + PR target/38123 + * config/i386/i386.c (ix86_gimplify_va_arg): Don't share valist between + gpr and other COMPONENT_REFs. + 2008-11-15 Richard Guenther PR tree-optimization/38051 diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index ed18fcc..38da3a4 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -6579,8 +6579,9 @@ ix86_gimplify_va_arg (tree valist, tree type, gimple_seq *pre_p, f_ovf = TREE_CHAIN (f_fpr); f_sav = TREE_CHAIN (f_ovf); + gpr = build3 (COMPONENT_REF, TREE_TYPE (f_gpr), + build_va_arg_indirect_ref (valist), f_gpr, NULL_TREE); valist = build_va_arg_indirect_ref (valist); - gpr = build3 (COMPONENT_REF, TREE_TYPE (f_gpr), valist, f_gpr, NULL_TREE); fpr = build3 (COMPONENT_REF, TREE_TYPE (f_fpr), valist, f_fpr, NULL_TREE); ovf = build3 (COMPONENT_REF, TREE_TYPE (f_ovf), valist, f_ovf, NULL_TREE); sav = build3 (COMPONENT_REF, TREE_TYPE (f_sav), valist, f_sav, NULL_TREE); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dac4651..3ff73d2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ +2008-11-15 Jakub Jelinek + + PR target/38123 + * gcc.c-torture/compile/pr38123.c: New test. + 2008-11-15 Richard Guenther - Jakub Jelinek + Jakub Jelinek PR tree-optimization/38051 * gcc.c-torture/execute/pr38051.c: New testcase. diff --git a/gcc/testsuite/gcc.c-torture/compile/pr38123.c b/gcc/testsuite/gcc.c-torture/compile/pr38123.c new file mode 100644 index 0000000..b36ad118 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr38123.c @@ -0,0 +1,13 @@ +/* PR target/38123 */ + +#include + +struct S { int i; double d; }; + +struct S +test (char *x, va_list ap) +{ + struct S s; + s = va_arg (ap, struct S); + return s; +} -- 2.7.4