aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2003-05-13 13:05:35 -0400
committerJason Merrill <jason@gcc.gnu.org>2003-05-13 13:05:35 -0400
commita65cddcf3959175275b11b9caedbe71a5d25ebe5 (patch)
treed7d118b337f71166a7b587512eb123dafdf47ce6
parentec86c71f91c119acb6bbca1729be81bcb9ea8add (diff)
downloadgcc-a65cddcf3959175275b11b9caedbe71a5d25ebe5.zip
gcc-a65cddcf3959175275b11b9caedbe71a5d25ebe5.tar.gz
gcc-a65cddcf3959175275b11b9caedbe71a5d25ebe5.tar.bz2
typeck.c (build_modify_expr): Don't always stabilize the lhs and rhs.
* typeck.c (build_modify_expr): Don't always stabilize the lhs and rhs. Do stabilize the lhs of a MODIFY_EXPR used on the lhs. From-SVN: r66766
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/typeck.c12
2 files changed, 9 insertions, 8 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8e19cee..f375a4f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-13 Jason Merrill <jason@redhat.com>
+
+ * typeck.c (build_modify_expr): Don't always stabilize the lhs and
+ rhs. Do stabilize the lhs of a MODIFY_EXPR used on the lhs.
+
2003-05-11 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
* method.c (synthesize_method): Call push/pop_deferring_access_checks.
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 20e602a..833d169 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -5336,6 +5336,10 @@ build_modify_expr (lhs, modifycode, rhs)
TREE_OPERAND (lhs, 0), newrhs);
case MODIFY_EXPR:
+ if (TREE_SIDE_EFFECTS (TREE_OPERAND (lhs, 0)))
+ lhs = build (TREE_CODE (lhs), TREE_TYPE (lhs),
+ stabilize_reference (TREE_OPERAND (lhs, 0)),
+ TREE_OPERAND (lhs, 1));
newrhs = build_modify_expr (TREE_OPERAND (lhs, 0), modifycode, rhs);
if (newrhs == error_mark_node)
return error_mark_node;
@@ -5541,14 +5545,6 @@ build_modify_expr (lhs, modifycode, rhs)
}
}
- if (TREE_CODE (lhstype) != REFERENCE_TYPE)
- {
- if (TREE_SIDE_EFFECTS (lhs))
- lhs = stabilize_reference (lhs);
- if (TREE_SIDE_EFFECTS (newrhs))
- newrhs = stabilize_reference (newrhs);
- }
-
/* Convert new value to destination type. */
if (TREE_CODE (lhstype) == ARRAY_TYPE)