2010-10-21 Martin Jambor <mjambor@suse.cz>

	PR tree-optimization/45875
	* tree.c (get_binfo_at_offset): Remove initial zero offset test.

	* testsuite/g++.dg/ipa/pr45875.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@165780 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bac7867..8d110cf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-21  Martin Jambor  <mjambor@suse.cz>
+
+       PR tree-optimization/45875
+       * tree.c (get_binfo_at_offset): Remove initial zero offset test.
+
 2010-10-21  Nathan Froyd  <froydnj@codesourcery.com>
 
        * tree-into-ssa.c (rewrite_update_enter_block): Remove unused

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b4387d5..c714e1f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-21  Martin Jambor  <mjambor@suse.cz>
+
+       PR tree-optimization/45875
+       * g++.dg/ipa/pr45875.C: New test.
+
 2010-10-21  Ira Rosen  <irar@il.ibm.com>
 
        PR tree-optimization/46049

diff --git a/gcc/testsuite/g++.dg/ipa/pr45875.C b/gcc/testsuite/g++.dg/ipa/pr45875.C
new file mode 100644 (file)
index 0000000..34f02e3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ipa/pr45875.C
@@ -0,0 +1,48 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -fno-early-inlining -fno-ipa-cp"  } */
+
+extern "C" void abort (void);
+
+class A
+{
+public:
+  virtual int foo (int i);
+};
+
+class B
+{
+public:
+  class A confusion;
+};
+
+int A::foo (int i)
+{
+  return i + 1;
+}
+
+int __attribute__ ((noinline,noclone)) get_input(void)
+{
+  return 1;
+}
+
+static int middleman_a (class A *obj, int i)
+{
+  return obj->foo (i);
+}
+
+static int middleman_b (class B *obj, int i)
+{
+  return middleman_a (&obj->confusion, i);
+}
+
+
+int main (int argc, char *argv[])
+{
+  class B b;
+  int i, j = get_input ();
+
+  for (i = 0; i < j; i++)
+    if (middleman_b (&b, j) != 2)
+      abort ();
+  return 0;
+}

diff --git a/gcc/tree.c b/gcc/tree.c
index 6d1b5a4..48279eb 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -10893,9 +10893,6 @@ get_binfo_at_offset (tree binfo, HOST_WIDE_INT offset, tree expected_type)
 {
   tree type;
 
-  if (offset == 0)
-    return binfo;
-
   type = TREE_TYPE (binfo);
   while (offset > 0)
     {