From 7c8027dacea0711ae7264b02e4ea9e40a8da947c Mon Sep 17 00:00:00 2001
From: Michael Bailey <michaelbailey0@gmail.com>
Date: Thu, 6 Mar 2008 10:07:25 -0800
Subject: [PATCH] 4741726: allow Object += String

Remove code in line with restriction removed from JLS

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/comp/Attr.java        | 15 ++++--------
 ...jectAppend.java => StringConversion2.java} | 23 +++++++++++--------
 2 files changed, 17 insertions(+), 21 deletions(-)
 rename langtools/test/tools/javac/{expression/ObjectAppend.java => StringConversion2.java} (73%)

diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
index bf06b95c51c..f597bc7f3e6 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -1609,17 +1609,10 @@ public class Attr extends JCTree.Visitor {
                               tree.getTag() - JCTree.ASGOffset,
                               owntype,
                               operand);
-            if (types.isSameType(operator.type.getReturnType(), syms.stringType)) {
-                // String assignment; make sure the lhs is a string
-                chk.checkType(tree.lhs.pos(),
-                              owntype,
-                              syms.stringType);
-            } else {
-                chk.checkDivZero(tree.rhs.pos(), operator, operand);
-                chk.checkCastable(tree.rhs.pos(),
-                                  operator.type.getReturnType(),
-                                  owntype);
-            }
+            chk.checkDivZero(tree.rhs.pos(), operator, operand);
+            chk.checkCastable(tree.rhs.pos(),
+                              operator.type.getReturnType(),
+                              owntype);
         }
         result = check(tree, owntype, VAL, pkind, pt);
     }
diff --git a/langtools/test/tools/javac/expression/ObjectAppend.java b/langtools/test/tools/javac/StringConversion2.java
similarity index 73%
rename from langtools/test/tools/javac/expression/ObjectAppend.java
rename to langtools/test/tools/javac/StringConversion2.java
index b92575f0d84..6e8db13e22d 100644
--- a/langtools/test/tools/javac/expression/ObjectAppend.java
+++ b/langtools/test/tools/javac/StringConversion2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,14 +23,17 @@
 
 /*
  * @test
- * @bug 4642850
- * @summary compiler allows Object += String
- * @author gafter
- *
- * @compile/fail ObjectAppend.java
+ * @bug 4741726
+ * @summary allow Object += String
  */
 
-class ObjectAppend {{
-    Object o = null;
-    o += "string";
-}}
+public class StringConversion2
+{
+    public static void main(String[] args) {
+        Object o = "Hello ";
+        String s = "World!";
+        o += s;
+        if (!o.equals("Hello World!"))
+            throw new Error("test failed");
+    }
+}