re PR tree-optimization/64312 (ICE: Segmentation fault)

2014-12-15  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/64312
	* tree-ssa-sccvn.c (vn_reference_lookup_pieces): Use
	vuse_ssa_val as callback to walk_non_aliased_vuses.
	(vn_reference_lookup): Likewise.

	* g++.dg/torture/pr64312.C: New testcase.

From-SVN: r218756

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c5a5a37ed153344f1f5fbee0c27793e207f9aa84..3d10b30f849db30fe177dabbd7dfc53dff1089b0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-15  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/64312
+       * tree-ssa-sccvn.c (vn_reference_lookup_pieces): Use
+       vuse_ssa_val as callback to walk_non_aliased_vuses.
+       (vn_reference_lookup): Likewise.
+
 2014-12-15  Segher Boessenkool  <segher@kernel.crashing.org>
 
        * gcc/config/rs6000/rs6000.md (*add>mode>3_imm_dot,

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 75e15d034c7809aeffb91ef55a36bafeb4a12f80..af88c0aada983b04287de0340ff55090e4afa222 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-15  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/64312
+       * g++.dg/torture/pr64312.C: New testcase.
+
 2014-12-15  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/58882

diff --git a/gcc/testsuite/g++.dg/torture/pr64312.C b/gcc/testsuite/g++.dg/torture/pr64312.C
new file mode 100644 (file)
index 0000000..dc3e95d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr64312.C
@@ -0,0 +1,123 @@
+// { dg-do compile }
+
+template <typename C> struct A
+{
+  typedef typename C::iterator type;
+};
+template <typename T2> struct B
+{
+  typedef T2 type;
+};
+template <typename F2> struct L
+{
+  typedef typename B<F2>::type::type type;
+};
+template <typename C> struct M
+{
+  typedef typename L<A<C> >::type type;
+};
+class C
+{
+public:
+  typedef int iterator;
+};
+template <class IteratorT> class D
+{
+public:
+  typedef IteratorT iterator;
+  template <class Iterator> D (Iterator p1, Iterator) : m_Begin (p1), m_End (0)
+  {
+  }
+  IteratorT m_Begin;
+  IteratorT m_End;
+};
+template <class IteratorT> class I : public D<IteratorT>
+{
+protected:
+  template <class Iterator>
+  I (Iterator p1, Iterator p2)
+      : D<IteratorT> (p1, p2)
+  {
+  }
+};
+class F
+{
+public:
+  int elems[];
+  int *
+  m_fn1 ()
+  {
+    return elems;
+  }
+};
+class G
+{
+public:
+  void *
+  m_fn2 (int)
+  {
+    return m_buffer.m_fn1 ();
+  }
+  F m_buffer;
+};
+struct any_incrementable_iterator_interface
+{
+  virtual ~any_incrementable_iterator_interface () {}
+};
+class J : public any_incrementable_iterator_interface
+{
+public:
+  J (int) : m_it () {}
+  int m_it;
+};
+void *operator new(__SIZE_TYPE__, void *p2) { return p2; }
+template <class T> typename M<T>::type begin (T) { return 0; }
+template <class T> typename M<T>::type end (T) {}
+template <class> class any_iterator
+{
+public:
+  template <class WrappedIterator> any_iterator (WrappedIterator)
+  {
+    void *ptr = m_buffer.m_fn2 (0);
+    m_impl = new (ptr) J (0);
+  }
+  ~any_iterator ()
+  {
+    if (m_impl)
+      m_impl->~any_incrementable_iterator_interface ();
+  }
+  G m_buffer;
+  any_incrementable_iterator_interface *m_impl;
+};
+template <class Reference> class K : public I<any_iterator<Reference> >
+{
+public:
+  template <class WrappedRange>
+  K (WrappedRange p1)
+      : I<any_iterator<Reference> > (begin (p1), end (p1))
+  {
+  }
+};
+template <class Reference> struct H
+{
+  typedef K<Reference> type;
+};
+template <class, class, class, class, class, class TargetReference>
+void
+mix_values_impl ()
+{
+  C test_data;
+  H<int>::type source_data (test_data);
+  typename H<TargetReference>::type t2 = source_data;
+}
+template <class>
+void
+mix_values_driver ()
+{
+  mix_values_impl<int, int, int, int, int, int &> ();
+}
+void
+mix_values ()
+{
+  mix_values_driver<int> ();
+}

diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index d7a4742caf6bd90d1e73181342e1dd06c90ed9c8..9902723b6732102c0d1e07edd516ea731a3f8631 100644 (file)
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -2161,7 +2161,7 @@ vn_reference_lookup_pieces (tree vuse, alias_set_type set, tree type,
          (vn_reference_t)walk_non_aliased_vuses (&r, vr1.vuse,
                                                  vn_reference_lookup_2,
                                                  vn_reference_lookup_3,
-                                                 vn_valueize, &vr1);
+                                                 vuse_ssa_val, &vr1);
       gcc_checking_assert (vr1.operands == shared_lookup_references);
     }
 
@@ -2214,7 +2214,7 @@ vn_reference_lookup (tree op, tree vuse, vn_lookup_kind kind,
        (vn_reference_t)walk_non_aliased_vuses (&r, vr1.vuse,
                                                vn_reference_lookup_2,
                                                vn_reference_lookup_3,
-                                               vn_valueize, &vr1);
+                                               vuse_ssa_val, &vr1);
       gcc_checking_assert (vr1.operands == shared_lookup_references);
       if (wvnresult)
        {