From eb1d5aafcc56354b5d741cd682fcfffb5acdafbe Mon Sep 17 00:00:00 2001 From: davidxl Date: Wed, 9 Dec 2009 17:44:47 +0000 Subject: [PATCH] fixing pr42337 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155111 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 + gcc/testsuite/ChangeLog | 5 + gcc/testsuite/g++.dg/tree-ssa/pr42337.C | 173 ++++++++++++++++++++++++++++++++ gcc/tree-ssa-pre.c | 11 +- 4 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/tree-ssa/pr42337.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index af6c4f2be94..9fff002fe26 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2009-12-09 Xinliang David Li + + PR tree-optimization/42337 + * tree-ssa-pre.c (phi_translate_1): Push and Pop SEEN set. + 2009-12-09 Nathan Froyd * config/rs6000/vector.md (absv2sf2, negv2sf2, addv2sf3, subv2sf3, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c054565a6cf..4e0e720cfb9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-12-09 Xinliang David Li + + PR tree-optimization/42337 + * g++.dg/tree-ssa/pr42337.C: New test. + 2009-12-08 Tobias Burnus PR fortran/41711 diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr42337.C b/gcc/testsuite/g++.dg/tree-ssa/pr42337.C new file mode 100644 index 00000000000..8abd4b2d161 --- /dev/null +++ b/gcc/testsuite/g++.dg/tree-ssa/pr42337.C @@ -0,0 +1,173 @@ +// PR tree-optimize/42337 +// { dg-do compile } +// { dg-options "-O2" } + +template struct pair { + _T2 second; +}; +template +inline const _Tp& max(const _Tp& __a, const _Tp& __b) { } + +template _ForwardIterator +lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __val, _Compare __comp) { } +template struct char_traits {}; + +template class __normal_iterator { + public: typedef _Iterator iterator_type; + __normal_iterator& operator++() { + } +}; +template +inline bool operator!=(const __normal_iterator<_IteratorL, _Container>& __lhs, const __normal_iterator<_IteratorR, _Container>& __rhs) { } +template class new_allocator { + public: + typedef _Tp* pointer; + typedef const _Tp* const_pointer; +}; + +template +class allocator: public new_allocator<_Tp> { + public: + template struct rebind { + typedef allocator<_Tp1> other; + }; +}; + +template struct unary_function { }; +template struct binary_function { }; +template struct less : public binary_function<_Tp, _Tp, bool> { }; +template struct _Select1st : public unary_function<_Pair, typename _Pair::first_type> { }; +template struct _Rb_tree_iterator { + typedef _Tp* pointer; + pointer operator->() const { + } +}; +template > +class _Rb_tree { + typedef _Val value_type; + public: typedef _Rb_tree_iterator iterator; +}; +template , typename _Alloc = allocator > > +class map { + public: typedef _Key key_type; + typedef pair value_type; + typedef _Compare key_compare; + private: typedef typename _Alloc::template rebind::other _Pair_alloc_type; + typedef _Rb_tree, key_compare, _Pair_alloc_type> _Rep_type; + public: typedef typename _Pair_alloc_type::pointer pointer; + typedef typename _Rep_type::iterator iterator; + iterator find(const key_type& __x) { } +}; + +template struct _Vector_base { + typedef typename _Alloc::template rebind<_Tp>::other _Tp_alloc_type; +}; +template > +class vector : protected _Vector_base<_Tp, _Alloc> { + typedef _Vector_base<_Tp, _Alloc> _Base; + typedef typename _Base::_Tp_alloc_type _Tp_alloc_type; + public: + typedef typename _Tp_alloc_type::pointer pointer; + typedef typename _Tp_alloc_type::const_pointer const_pointer; + typedef __normal_iterator iterator; + typedef __normal_iterator const_iterator; + iterator begin() { } + const_iterator begin() const { } + const_iterator end() const { } + unsigned long size() const { } +}; + +class SSC { + public: + SSC () {} + SSC (const int& cs); +}; +extern int flag; + +struct TP { + const int cl_; + const vector &its_; + int max_s_; + }; + +double foo(TP *p); +map cs_; + +template class vector32 { + public: + typedef T& reference; + typedef T* iterator; + typedef const T* const_iterator; + iterator begin() { return data_; } + iterator end() { return data_ + size_; } + long unsigned int size() const { return size_; } + T* data_; + unsigned size_; +}; + +struct SF : public pair { }; + +template class SFVT { + private: typedef vector32 Container; + typedef typename Container::const_iterator CI; + mutable Container v_; + mutable bool sorted_; + struct Cmp : public binary_function { + }; + __attribute__((always_inline)) VALUE IS(const SFVT &sfv) const { + if (sfv.v_.size() < v_.size()) { + return sfv.IS(*this); + } + else { + VALUE sum = 0.0; + CI beg = sfv.v_.begin(); + CI end = sfv.v_.end(); + for (CI i = v_.begin(); + i != v_.end(); + ++i) { beg = lower_bound(beg, end, *i, Cmp()); if (beg == end) { return sum; } } + } + } + public: explicit SFVT(const int capacity = 0) : sorted_(true) { } + long unsigned int size() const { } + __attribute__((always_inline)) VALUE DP(const SFVT &sfv) const { + return IS(sfv); + } +}; +class SFV : public SFVT { }; + +class Edge; +extern int flag2; + +double foo(TP *p) { + int nbests_requested = max(p->max_s_, flag); + map::iterator it = cs_.find(p->cl_); + int* c = &it->second; + for (vector::const_iterator iter = p->its_.begin(); + iter != p->its_.end(); + ++iter) { + } + vector fb; + vector w; + int *hg = 0; + if (flag2 == 10) { + hg = &flag2; + } + int nr = 0; + for (vector::iterator iter = fb.begin(); + (iter != fb.end() && nr < nbests_requested); + ++iter) { + } + if (hg) { + SFV s_weights; + for (int i = 0; + i < w.size(); + ++i) { + } + SFV uw; + for (int i = 0, j = 0; + i < uw.size() && j < s_weights.size(); + ) { + } + const double tc = uw.DP(s_weights); + } +} diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index a3e7ad824b4..b8e999ccdca 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -1490,10 +1490,17 @@ phi_translate_1 (pre_expr expr, bitmap_set_t set1, bitmap_set_t set2, continue; else { + pre_expr leader, result; + bitmap temp = BITMAP_ALLOC (&grand_bitmap_obstack); unsigned int op_val_id = VN_INFO (newnary.op[i])->value_id; - pre_expr leader = find_leader_in_sets (op_val_id, set1, set2); - pre_expr result = phi_translate_1 (leader, set1, set2, + + bitmap_copy (temp, seen); + leader = find_leader_in_sets (op_val_id, set1, set2); + result = phi_translate_1 (leader, set1, set2, pred, phiblock, seen); + bitmap_copy (seen, temp); + BITMAP_FREE (temp); + if (result && result != leader) { tree name = get_representative_for (result); -- 2.11.4.GIT