materialize Pstring in StringBuiltins.AddNode

Author: tomasstupka

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

@@ -98,9 +98,11 @@
 import com.oracle.graal.python.builtins.objects.str.StringNodes.JoinInternalNode;
 import com.oracle.graal.python.builtins.objects.str.StringNodes.SpliceNode;
 import com.oracle.graal.python.builtins.objects.str.StringNodes.StringLenNode;
+import com.oracle.graal.python.builtins.objects.str.StringNodes.StringMaterializeNode;
 import com.oracle.graal.python.builtins.objects.str.StringUtils.StripKind;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins;
+import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsSameTypeNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
@@ -404,30 +406,58 @@ String doSSSimple(String self, String other) {
             return self;
         }
 
-        @Specialization(guards = "!concatGuard(self, other.getCharSequence())")
-        String doSSSimple(String self, PString other) {
+        @Specialization(guards = "!concatGuard(self, other.getCharSequence())", limit = "1")
+        Object doSSSimple(String self, PString other,
+                        @Cached StringMaterializeNode materializeNode,
+                        @Cached IsSameTypeNode isSameType,
+                        @Cached BranchProfile isSameBranch,
+                        @CachedLibrary("other") PythonObjectLibrary lib) {
             if (LazyString.length(self, leftProfile1, leftProfile2) == 0) {
                 // result type has to be str
-                return toString(other.getCharSequence());
+                if (isSameType.execute(lib.getLazyPythonClass(other), PythonBuiltinClassType.PString)) {
+                    isSameBranch.enter();
+                    return other;
+                }
+                return materializeNode.execute(other);
             }
             return self;
         }
 
-        @Specialization(guards = "!concatGuard(self.getCharSequence(), other)")
-        String doSSSimple(PString self, String other) {
+        @Specialization(guards = "!concatGuard(self.getCharSequence(), other)", limit = "1")
+        Object doSSSimple(PString self, String other,
+                        @Cached StringMaterializeNode materializeNode,
+                        @Cached IsSameTypeNode isSameType,
+                        @Cached BranchProfile isSameBranch,
+                        @CachedLibrary("self") PythonObjectLibrary lib) {
             if (LazyString.length(self.getCharSequence(), leftProfile1, leftProfile2) == 0) {
                 return other;
             }
             // result type has to be str
-            return toString(self.getCharSequence());
+            if (isSameType.execute(lib.getLazyPythonClass(self), PythonBuiltinClassType.PString)) {
+                isSameBranch.enter();
+                return self;
+            }
+            return materializeNode.execute(self);
         }
 
         @Specialization(guards = "!concatGuard(self.getCharSequence(), other.getCharSequence())")
-        String doSSSimple(PString self, PString other) {
+        Object doSSSimple(PString self, PString other,
+                        @Cached StringMaterializeNode materializeNode,
+                        @Cached IsSameTypeNode isSameType,
+                        @Cached BranchProfile isSameBranch,
+                        @CachedLibrary(limit = "1") PythonObjectLibrary lib) {
             if (LazyString.length(self.getCharSequence(), leftProfile1, leftProfile2) == 0) {
-                return toString(other.getCharSequence());
+                if (isSameType.execute(lib.getLazyPythonClass(other), PythonBuiltinClassType.PString)) {
+                    isSameBranch.enter();
+                    return other;
+                }
+                return materializeNode.execute(other);
             }
-            return toString(self.getCharSequence());
+            if (isSameType.execute(lib.getLazyPythonClass(self), PythonBuiltinClassType.PString)) {
+                isSameBranch.enter();
+                return self;
+            }
+            return materializeNode.execute(self);
         }
 
         @Specialization(guards = "concatGuard(self.getCharSequence(), other)")
@@ -476,11 +506,6 @@ private static String stringConcat(CharSequence left, CharSequence right) {
             return left.toString() + right.toString();
         }
 
-        @TruffleBoundary
-        private static String toString(CharSequence cs) {
-            return cs.toString();
-        }
-
         @Specialization(guards = "isString(self)")
         Object doSNative(VirtualFrame frame, Object self, PythonAbstractNativeObject other,
                         @Cached CastToJavaStringNode cast,