From aef309a12f6689011d284190a21133e79a9f7cd2 Mon Sep 17 00:00:00 2001 From: ebotcazou Date: Thu, 21 Nov 2002 21:42:40 +0000 Subject: [PATCH] PR c++/8342 * typeck.c (get_member_function_from_ptrfunc): Make sure that a SAVE_EXPR for instance_ptr doesn't get evaluated first inside one of the branches of a COND_EXPR. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@59360 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/typeck.c | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d370dbd..ca4839c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2002-11-21 Glen Nakamura + + PR c++/8342 + * typeck.c (get_member_function_from_ptrfunc): Make sure that a + SAVE_EXPR for instance_ptr doesn't get evaluated first inside one + of the branches of a COND_EXPR. + 2002-11-19 Mark Mitchell * pt.c (for_each_template_parm): Free allocated memory. diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 55b6dbd..c0e3fa6 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -2541,6 +2541,7 @@ get_member_function_from_ptrfunc (instance_ptrptr, function) tree fntype = TYPE_PTRMEMFUNC_FN_TYPE (TREE_TYPE (function)); tree instance_ptr = *instance_ptrptr; + tree instance_save_expr = 0; if (instance_ptr == error_mark_node) { if (TREE_CODE (function) == PTRMEM_CST) @@ -2560,7 +2561,7 @@ get_member_function_from_ptrfunc (instance_ptrptr, function) } if (TREE_SIDE_EFFECTS (instance_ptr)) - instance_ptr = save_expr (instance_ptr); + instance_ptr = instance_save_expr = save_expr (instance_ptr); if (TREE_SIDE_EFFECTS (function)) function = save_expr (function); @@ -2621,9 +2622,9 @@ get_member_function_from_ptrfunc (instance_ptrptr, function) /* Make sure this doesn't get evaluated first inside one of the branches of the COND_EXPR. */ - if (TREE_CODE (instance_ptr) == SAVE_EXPR) + if (instance_save_expr) e1 = build (COMPOUND_EXPR, TREE_TYPE (e1), - instance_ptr, e1); + instance_save_expr, e1); function = e1; } -- 2.7.4