From fbeb30a9e1eb6527d802b94bb3d34d646981efff Mon Sep 17 00:00:00 2001 From: rguenth Date: Tue, 20 May 2008 10:03:27 +0000 Subject: [PATCH] 2008-05-20 Richard Guenther * tree-vn.c (vn_lookup_with_vuses): Do not use the alias oracle. * gcc.c-torture/execute/20080519-1.c: New testcase. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@135605 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 4 ++ gcc/testsuite/ChangeLog | 4 ++ gcc/testsuite/gcc.c-torture/execute/20080519-1.c | 58 ++++++++++++++++++++++++ gcc/tree-vn.c | 4 +- 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.c-torture/execute/20080519-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8d52eb2..fc28f21 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2008-05-20 Richard Guenther + + * tree-vn.c (vn_lookup_with_vuses): Do not use the alias oracle. + 2008-05-20 Kai Tietz * config/i386/i386-protos.h (ix86_return_in_memory): Removed. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 22843a8..e0ac508 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2008-05-20 Richard Guenther + + * gcc.c-torture/execute/20080519-1.c: New testcase. + 2008-05-19 Xinliang David Li * gcc.dg/cdce1.c: Remove test. diff --git a/gcc/testsuite/gcc.c-torture/execute/20080519-1.c b/gcc/testsuite/gcc.c-torture/execute/20080519-1.c new file mode 100644 index 0000000..303c4e6 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/20080519-1.c @@ -0,0 +1,58 @@ +extern void abort (void); + +typedef unsigned long HARD_REG_SET[2]; +HARD_REG_SET reg_class_contents[2]; + +struct du_chain +{ + struct du_chain *next_use; + int cl; +}; + +void __attribute__((noinline)) +merge_overlapping_regs (HARD_REG_SET *p) +{ + if ((*p)[0] != -1 || (*p)[1] != -1) + abort (); +} + +void __attribute__((noinline)) +regrename_optimize (struct du_chain *this) +{ + HARD_REG_SET this_unavailable; + unsigned long *scan_fp_; + int n_uses; + struct du_chain *last; + + this_unavailable[0] = 0; + this_unavailable[1] = 0; + + n_uses = 0; + for (last = this; last->next_use; last = last->next_use) + { + scan_fp_ = reg_class_contents[last->cl]; + n_uses++; + this_unavailable[0] |= ~ scan_fp_[0]; + this_unavailable[1] |= ~ scan_fp_[1]; + } + if (n_uses < 1) + return; + + scan_fp_ = reg_class_contents[last->cl]; + this_unavailable[0] |= ~ scan_fp_[0]; + this_unavailable[1] |= ~ scan_fp_[1]; + + merge_overlapping_regs (&this_unavailable); +} + +int main() +{ + struct du_chain du1 = { 0, 0 }; + struct du_chain du0 = { &du1, 1 }; + reg_class_contents[0][0] = -1; + reg_class_contents[0][1] = -1; + reg_class_contents[1][0] = 0; + reg_class_contents[1][1] = 0; + regrename_optimize (&du0); + return 0; +} diff --git a/gcc/tree-vn.c b/gcc/tree-vn.c index 40efea6..1d2e5a5 100644 --- a/gcc/tree-vn.c +++ b/gcc/tree-vn.c @@ -306,7 +306,9 @@ vn_lookup_with_vuses (tree expr, VEC (tree, gc) *vuses) if (is_gimple_min_invariant (expr) || TREE_CODE (expr) == FIELD_DECL) return expr; - return vn_reference_lookup (expr, vuses, true); + /* We may not walk the use-def chains here as the alias oracle cannot + properly deal with VALUE_HANDLE tree nodes we feed it here. */ + return vn_reference_lookup (expr, vuses, false); } static tree -- 2.7.4