Ensure that 'toString' does not need a context.

Author: fangerer

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

@@ -203,6 +203,7 @@ public enum PythonBuiltinClassType implements LazyPythonClass {
         this(name, null);
     }
 
+    @Override
     public String getName() {
         return name;
     }

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

@@ -53,6 +53,11 @@ public interface PythonNativeClass extends PythonAbstractClass {
 
     TruffleObject getPtr();
 
+    @Override
+    default String getName() {
+        return String.format("PythonNativeClass(%s)", getPtr());
+    }
+
     static boolean isInstance(Object object) {
         return object instanceof PythonAbstractNativeObject;
     }

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

@@ -118,7 +118,7 @@ public String toString() {
         if (enclosingType == null) {
             return String.format("PBuiltinFunction %s at 0x%x", name, hashCode());
         } else {
-            return String.format("PBuiltinFunction %s.%s at 0x%x", GetNameNode.doSlowPath(enclosingType), name, hashCode());
+            return String.format("PBuiltinFunction %s.%s at 0x%x", enclosingType.getName(), name, hashCode());
         }
     }
 

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

@@ -48,7 +48,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-public class LazyString implements CharSequence {
+public class LazyString implements PCharSequence {
 
     protected static final int MinLazyStringLength;
     protected static final boolean UseLazyStrings;
@@ -157,22 +157,26 @@ public int length() {
 
     @Override
     public String toString() {
-        if (!isFlat()) {
-            flatten();
+        if (!isMaterialized()) {
+            return materialize();
         }
         return (String) left;
     }
 
-    private boolean isFlat() {
+    @Override
+    public boolean isMaterialized() {
         return right == null;
     }
 
+    @Override
     @TruffleBoundary
-    private void flatten() {
+    public String materialize() {
         char[] dst = new char[len];
-        flatten(this, 0, len, dst, 0);
-        left = new String(dst);
+        LazyString.flatten(this, 0, len, dst, 0);
+        String flattened = new String(dst);
+        left = flattened;
         right = null;
+        return flattened;
     }
 
     private static void flatten(CharSequence src, int srcBegin, int srcEnd, char[] dst, int dstBegin) {

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

@@ -40,17 +40,13 @@
  */
 package com.oracle.graal.python.builtins.objects.str;
 
+import java.util.Objects;
+
 import com.oracle.graal.python.builtins.objects.cext.CExtNodes.PCallCapiFunction;
 import com.oracle.graal.python.builtins.objects.cext.NativeCAPISymbols;
-import org.graalvm.nativeimage.ImageInfo;
-
-import com.oracle.graal.python.nodes.PGuards;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 
-public class NativeCharSequence implements CharSequence {
+public class NativeCharSequence implements PCharSequence {
 
     private final Object ptr;
     private String materialized;
@@ -74,15 +70,25 @@ public CharSequence subSequence(int start, int end) {
         return materialize().subSequence(start, end);
     }
 
-    private String materialize() {
-        if(materialized == null) {
+    @Override
+    public boolean isMaterialized() {
+        return materialized != null;
+    }
+
+    @Override
+    public String materialize() {
+        if(!isMaterialized()) {
             materialized = (String) PCallCapiFunction.getUncached().call(NativeCAPISymbols.FUN_PY_TRUFFLE_CSTR_TO_STRING, ptr);
         }
         return materialized;
     }
 
     @Override
     public String toString() {
-        return materialize();
+        CompilerAsserts.neverPartOfCompilation();
+        if(isMaterialized()) {
+            return materialized;
+        }
+        return Objects.toString(ptr);
     }
 }

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.builtins.objects.str;
+
+public interface PCharSequence extends CharSequence {
+
+    boolean isMaterialized();
+    String materialize();
+}

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

@@ -44,6 +44,13 @@ public PString(LazyPythonClass clazz, CharSequence value) {
     }
 
     public String getValue() {
+        if(value instanceof PCharSequence) {
+            PCharSequence s = (PCharSequence)value;
+            if(!s.isMaterialized()) {
+                return s.materialize();
+            }
+            return s.toString();
+        }
         return value.toString();
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/LazyPythonClass.java

@@ -43,4 +43,9 @@
 import com.oracle.truffle.api.interop.TruffleObject;
 
 public interface LazyPythonClass extends TruffleObject {
+
+    /**
+     * Returns the name of the class for debugging purposes. This method must assume that no context is available.
+     */
+    String getName();
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonManagedClass.java

@@ -130,7 +130,8 @@ public MroSequenceStorage getMethodResolutionOrder() {
         return methodResolutionOrder;
     }
 
-    String getName() {
+    @Override
+    public String getName() {
         return className;
     }