re PR c++/26577 (ICE in cp_expr_size with volatile and non POD)

        PR c++/26577
        * call.c (build_new_method_call): Force evaluation of the
        instance pointer, not the object.

From-SVN: r115105

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 18551fbd95201682ac2bdb9f40633f12f10f9b40..29888c7b2bcaa9236e9eb6d806ecebf73cb59985 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-30  Jason Merrill  <jason@redhat.com>
+
+       PR c++/26577
+       * call.c (build_new_method_call): Force evaluation of the 
+       instance pointer, not the object.
+
 2006-06-30  Kazu Hirata  <kazu@codesourcery.com>
 
        * decl2.c: Fix a comment typo.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 970fce7ad220bd8798f6424c194a93df5f7241e8..ea89cdfed771564fca0d1f2bceccc0e7de5e2326 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5501,9 +5501,9 @@ build_new_method_call (tree instance, tree fns, tree args,
                 none-the-less evaluated.  */
              if (TREE_CODE (TREE_TYPE (fn)) != METHOD_TYPE
                  && !is_dummy_object (instance_ptr)
-                 && TREE_SIDE_EFFECTS (instance))
+                 && TREE_SIDE_EFFECTS (instance_ptr))
                call = build2 (COMPOUND_EXPR, TREE_TYPE (call),
-                              instance, call);
+                              instance_ptr, call);
            }
        }
     }

diff --git a/gcc/testsuite/g++.dg/init/volatile1.C b/gcc/testsuite/g++.dg/init/volatile1.C
new file mode 100644 (file)
index 0000000..9080ed5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/volatile1.C
@@ -0,0 +1,16 @@
+// PR c++/26577
+// The call to bar() was causing an inappropriate dereference of *this,
+// which led to an abort in cp_expr_size.
+
+struct A
+{
+  A(const A&);
+  A& operator=(const A&);
+  static void bar();
+  void baz() volatile;
+};
+
+void A::baz() volatile
+{
+  bar();
+}