2012-05-16 Richard Guenther <rguenther@suse.de>

	PR tree-optimization/53364
	* tree-ssa-alias.c (indirect_ref_may_alias_decl_p): Properly
	detect a view-conversion of the decl.

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@187589 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8ddb1fe..a107bf5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-16  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/53364
+       * tree-ssa-alias.c (indirect_ref_may_alias_decl_p): Properly
+       detect a view-conversion of the decl.
+
 2012-05-15  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/53358

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0645a4c..937ab7a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-16  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/53364
+       * g++.dg/torture/pr53364.C: New testcase.
+
 2012-05-15  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/53358

diff --git a/gcc/testsuite/g++.dg/torture/pr53364.C b/gcc/testsuite/g++.dg/torture/pr53364.C
new file mode 100644 (file)
index 0000000..36bb083
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr53364.C
@@ -0,0 +1,37 @@
+// { dg-do run }
+
+extern "C" void abort (void);
+
+template<typename _Tp>
+inline const _Tp&
+min(const _Tp& __a, const _Tp& __b)
+{
+  if (__b < __a)
+    return __b;
+  return __a;
+}
+
+struct A
+{
+  int m_x;
+
+  explicit A(int x) : m_x(x) {}
+  operator int() const { return m_x; }
+};
+
+struct B : public A
+{
+public:
+  explicit B(int x) : A(x) {}
+};
+
+int data = 1;
+
+int main()
+{
+  B b = B(10);
+  b = min(b, B(data));
+  if (b != 1)
+    abort ();
+  return 0;
+}

diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index dd90432..e3a8ad0 100644 (file)
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -804,8 +804,7 @@ indirect_ref_may_alias_decl_p (tree ref1 ATTRIBUTE_UNUSED, tree base1,
 
   /* If either reference is view-converted, give up now.  */
   if (same_type_for_tbaa (TREE_TYPE (base1), TREE_TYPE (ptrtype1)) != 1
-      || same_type_for_tbaa (TREE_TYPE (dbase2),
-                            TREE_TYPE (reference_alias_ptr_type (dbase2))) != 1)
+      || same_type_for_tbaa (TREE_TYPE (dbase2), TREE_TYPE (base2)) != 1)
     return true;
 
   /* If both references are through the same type, they do not alias