re PR java/13733 (The result of an assignment operator is the LHS after assignment...

PR java/13733
* parse.y (patch_assignment): Don't modify lhs_type for
reference assignments.

From-SVN: r76382

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index d9027c016fbbd89ff021290dbc44ac332263f20a..5d9ae79d2e1b260f4db29f8f9dae92f00dec8e69 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-22  Jeff Sturm  <jsturm@one-point.com>
+
+       PR java/13733
+       * parse.y (patch_assignment): Don't modify lhs_type for
+       reference assignments.
+
 2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
 
        * Make-lang.in: Replace $(docdir) with doc.

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 20e6f9add999c3ad3a08982ad94909f3854dbaa6..507e9583e86ff90f4415a1eaddc49ab0de1cac62 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -12652,8 +12652,8 @@ patch_assignment (tree node, tree wfl_op1)
   new_rhs = try_builtin_assignconv (wfl_op1, lhs_type, rhs);
 
   /* 5.2 If it failed, try a reference conversion */
-  if (!new_rhs && (new_rhs = try_reference_assignconv (lhs_type, rhs)))
-    lhs_type = promote_type (rhs_type);
+  if (!new_rhs)
+    new_rhs = try_reference_assignconv (lhs_type, rhs);
 
   /* 15.25.2 If we have a compound assignment, convert RHS into the
      type of the LHS */