toString functions are not meant to be PE'd

Author: lukasstadler

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -27,6 +27,8 @@
 
 import java.util.HashMap;
 
+import com.oracle.truffle.api.CompilerAsserts;
+
 public enum PythonBuiltinClassType {
 
     TruffleObject(com.oracle.truffle.api.interop.TruffleObject.class, "truffle_object"),
@@ -109,6 +111,7 @@ public enum PythonBuiltinClassType {
 
     @Override
     public String toString() {
+        CompilerAsserts.neverPartOfCompilation();
         return shortName;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PEllipsis.java

@@ -38,6 +38,8 @@
  */
 package com.oracle.graal.python.builtins.objects;
 
+import com.oracle.truffle.api.CompilerAsserts;
+
 public final class PEllipsis extends PythonAbstractObject {
 
     public static final PEllipsis INSTANCE = new PEllipsis();
@@ -47,6 +49,7 @@ private PEllipsis() {
 
     @Override
     public String toString() {
+        CompilerAsserts.neverPartOfCompilation();
         return "Ellipsis";
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PNone.java

@@ -25,6 +25,8 @@
  */
 package com.oracle.graal.python.builtins.objects;
 
+import com.oracle.truffle.api.CompilerAsserts;
+
 public final class PNone extends PythonAbstractObject {
 
     public static final PNone NONE = new PNone();
@@ -35,6 +37,7 @@ private PNone() {
 
     @Override
     public String toString() {
+        CompilerAsserts.neverPartOfCompilation();
         return this == NONE ? "None" : "NoValue";
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PNotImplemented.java

@@ -25,6 +25,8 @@
  */
 package com.oracle.graal.python.builtins.objects;
 
+import com.oracle.truffle.api.CompilerAsserts;
+
 public final class PNotImplemented extends PythonAbstractObject {
 
     public static final PNotImplemented NOT_IMPLEMENTED = new PNotImplemented();
@@ -34,6 +36,7 @@ private PNotImplemented() {
 
     @Override
     public String toString() {
+        CompilerAsserts.neverPartOfCompilation();
         return "NotImplemented";
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/PCharArray.java

@@ -28,6 +28,7 @@
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.SequenceUtil;
+import com.oracle.truffle.api.CompilerAsserts;
 
 public final class PCharArray extends PArray {
 
@@ -81,6 +82,7 @@ public int len() {
 
     @Override
     public String toString() {
+        CompilerAsserts.neverPartOfCompilation();
         StringBuilder buf = new StringBuilder();
         buf.append("array('c', [");
         for (int i = 0; i < array.length - 1; i++) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/PDoubleArray.java

@@ -28,6 +28,7 @@
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.SequenceUtil;
+import com.oracle.truffle.api.CompilerAsserts;
 
 public final class PDoubleArray extends PArray {
 
@@ -82,6 +83,7 @@ public int len() {
 
     @Override
     public String toString() {
+        CompilerAsserts.neverPartOfCompilation();
         StringBuilder buf = new StringBuilder();
         buf.append("array('d', [");
         for (int i = 0; i < array.length - 1; i++) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/PIntArray.java

@@ -28,6 +28,7 @@
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.SequenceUtil;
+import com.oracle.truffle.api.CompilerAsserts;
 
 public final class PIntArray extends PArray {
 
@@ -82,6 +83,7 @@ public int len() {
 
     @Override
     public String toString() {
+        CompilerAsserts.neverPartOfCompilation();
         StringBuilder buf = new StringBuilder();
         buf.append("array('i', [");
         for (int i = 0; i < array.length - 1; i++) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/PLongArray.java

@@ -28,6 +28,7 @@
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.SequenceUtil;
+import com.oracle.truffle.api.CompilerAsserts;
 
 public final class PLongArray extends PArray {
 
@@ -82,6 +83,7 @@ public int len() {
 
     @Override
     public String toString() {
+        CompilerAsserts.neverPartOfCompilation();
         StringBuilder buf = new StringBuilder();
         buf.append("array('i', [");
         for (int i = 0; i < array.length - 1; i++) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/ByteArrayBuiltins.java

@@ -72,6 +72,7 @@
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStoreException;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
@@ -263,6 +264,7 @@ public Object str(PByteArray self) {
     @GenerateNodeFactory
     public abstract static class ReprNode extends PythonUnaryBuiltinNode {
         @Specialization
+        @TruffleBoundary
         public Object repr(PByteArray self) {
             return self.toString();
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesBuiltins.java

@@ -38,7 +38,6 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RADD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RMUL__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__STR__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 
 import java.nio.charset.CodingErrorAction;
@@ -179,19 +178,11 @@ public Object mul(Object self, Object other) {
     public abstract static class RMulNode extends MulNode {
     }
 
-    @Builtin(name = __STR__, fixedNumOfArguments = 1)
-    @GenerateNodeFactory
-    public abstract static class StrNode extends PythonUnaryBuiltinNode {
-        @Specialization
-        public Object str(PBytes self) {
-            return self.toString();
-        }
-    }
-
     @Builtin(name = __REPR__, fixedNumOfArguments = 1)
     @GenerateNodeFactory
     public abstract static class ReprNode extends PythonUnaryBuiltinNode {
         @Specialization
+        @TruffleBoundary
         public Object repr(PBytes self) {
             return self.toString();
         }