put instances of String construction behind TruffleBoundary

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -907,12 +907,7 @@ Object floatFromString(VirtualFrame frame, Object cls, String arg) {
         }
 
         private double convertBytesToDouble(VirtualFrame frame, PBytesLike arg) {
-            return convertStringToDouble(frame, createString(getByteArray(frame, arg)), arg);
-        }
-
-        @TruffleBoundary
-        private static String createString(byte[] bytes) {
-            return new String(bytes);
+            return convertStringToDouble(frame, PythonUtils.newString(getByteArray(frame, arg)), arg);
         }
 
         private double convertStringToDouble(VirtualFrame frame, String src, Object origObj) {
@@ -995,7 +990,7 @@ static boolean isHandledType(PythonObjectLibrary lib, Object o) {
                 return convertBytesToDouble(frame, (PBytesLike) obj);
             } else if (lib.isBuffer(obj)) {
                 try {
-                    return convertStringToDouble(frame, createString(lib.getBufferBytes(obj)), obj);
+                    return convertStringToDouble(frame, PythonUtils.newString(lib.getBufferBytes(obj)), obj);
                 } catch (UnsupportedMessageException e) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
                     throw new IllegalStateException("Object claims to be a buffer but does not support getBufferBytes()");

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -1716,12 +1716,7 @@ public Object asciiGeneric(VirtualFrame frame, Object obj,
                         @Cached ReprNode reprNode) {
             String repr = (String) reprNode.call(frame, obj);
             byte[] bytes = BytesUtils.unicodeEscape(repr);
-            return newString(bytes);
-        }
-
-        @TruffleBoundary
-        private static String newString(byte[] bytes) {
-            return new String(bytes);
+            return PythonUtils.newString(bytes);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

@@ -2834,6 +2834,7 @@ Object doIt(Object self, String className) {
     @TypeSystemReference(PythonTypes.class)
     public abstract static class PyTruffle_Type_Modified extends PythonTernaryBuiltinNode {
 
+        @TruffleBoundary
         @Specialization(guards = {"isNativeClass(clazz)", "isNoValue(mroTuple)"})
         Object doIt(Object clazz, String name, @SuppressWarnings("unused") PNone mroTuple) {
             CyclicAssumption nativeClassStableAssumption = getContext().getNativeClassStableAssumption((PythonNativeClass) clazz, false);
@@ -2843,6 +2844,7 @@ Object doIt(Object clazz, String name, @SuppressWarnings("unused") PNone mroTupl
             return PNone.NONE;
         }
 
+        @TruffleBoundary
         @Specialization(guards = "isNativeClass(clazz)")
         Object doIt(Object clazz, String name, PTuple mroTuple,
                         @Cached("createClassProfile()") ValueProfile profile) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java

@@ -139,6 +139,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.TruffleLogger;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
@@ -2777,6 +2778,7 @@ protected Object doSlowPath(Object obj, NativeMember memberName) {
             return getUncachedForMember(memberName).execute(PCallCapiFunction.getUncached().call(getterFuncName, ToSulongNode.getUncached().execute(obj)));
         }
 
+        @TruffleBoundary
         protected String getterFuncName(NativeMember memberName) {
             String name = "get_" + memberName.getMemberName();
             assert NativeCAPISymbols.isValid(name) : "invalid native member getter function " + name;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PFunction.java

@@ -150,6 +150,7 @@ public PCode getCode() {
         return code;
     }
 
+    @TruffleBoundary
     public void setCode(PCode code) {
         codeStableAssumption.invalidate("code changed for function " + getName());
         assert code != null : "code cannot be null";

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

@@ -959,7 +959,7 @@ static String doStringString(String self, String table) {
                 translatedChars[i] = translation;
             }
 
-            return new String(translatedChars);
+            return PythonUtils.newString(translatedChars);
         }
 
         @Specialization
@@ -1723,7 +1723,7 @@ String doCharInt(String left, int right) {
             try {
                 char[] result = new char[right];
                 Arrays.fill(result, left.charAt(0));
-                return new String(result);
+                return PythonUtils.newString(result);
             } catch (OutOfMemoryError e) {
                 throw raise(MemoryError);
             }
@@ -1790,7 +1790,7 @@ private String repeatString(String left, int times, LoopConditionProfile loopPro
                     PythonUtils.arraycopy(result, 0, result, done, len);
                     done += len;
                 }
-                return new String(result);
+                return PythonUtils.newString(result);
             } catch (OutOfMemoryError e) {
                 throw raise(MemoryError);
             }
@@ -2151,7 +2151,7 @@ private static String zfill(String self, int width) {
                 chars[i] = '0';
             }
             self.getChars(sStart, len, chars, i);
-            return new String(chars);
+            return PythonUtils.newString(chars);
         }
     }
 
@@ -2308,7 +2308,7 @@ public String doString(String primary, PSlice slice,
                     newChars[j++] = primary.charAt(i);
                 }
 
-                return new String(newChars);
+                return PythonUtils.newString(newChars);
             }
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/PythonUtils.java

@@ -150,6 +150,11 @@ public static RootCallTarget getOrCreateCallTarget(RootNode rootNode) {
         return ct;
     }
 
+    @TruffleBoundary(allowInlining = true)
+    public static String newString(byte[] bytes) {
+        return new String(bytes);
+    }
+
     @TruffleBoundary(allowInlining = true)
     public static String newString(char[] chars) {
         return new String(chars);