avoid calling toString in various places

lukasstadler · lukasstadler · commit 6b778ca51989 · 2018-06-25T13:13:44.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java
@@ -55,6 +55,7 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.ContainsKeyNode;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.str.PString;
+import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -265,8 +266,19 @@ Object getItem(PDict self, Object key,
     public abstract static class MissingNode extends PythonBuiltinNode {
         @SuppressWarnings("unused")
         @Specialization
-        Object run(Object self, Object key) {
-            throw raise(KeyError, "%s", key.toString());
+        Object run(Object self, String key) {
+            throw raise(KeyError, "%s", key);
+        }
+
+        @SuppressWarnings("unused")
+        @Specialization(guards = "!isString(key)")
+        Object run(Object self, Object key,
+                        @Cached("create(__REPR__)") LookupAndCallUnaryNode specialNode) {
+            Object name = specialNode.executeObject(key);
+            if (!PGuards.isString(name)) {
+                throw raise(TypeError, "__repr__ returned non-string (type %p)", name);
+            }
+            throw raise(KeyError, "%s", name);
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java
@@ -75,13 +75,15 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
+import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 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;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -166,17 +168,14 @@ public Object str(Object self,
     }
 
     @Builtin(name = __REPR__, fixedNumOfArguments = 1)
+    @TypeSystemReference(PythonArithmeticTypes.class)
     @GenerateNodeFactory
     public abstract static class ReprNode extends PythonUnaryBuiltinNode {
         @Specialization
-        Object repr(PythonNativeObject self,
+        @TruffleBoundary
+        Object repr(Object self,
                         @Cached("create()") GetClassNode getClass) {
-            return "<" + getClass.execute(self).getName() + " object at 0x" + self.hashCode() + ">";
-        }
-
-        @Fallback
-        public Object repr(Object self) {
-            return self.toString();
+            return String.format("<%s object at 0x%x>", getClass.execute(self).getName(), self.hashCode());
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/PythonBuiltinBaseNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/PythonBuiltinBaseNode.java
@@ -38,33 +38,14 @@
  */
 package com.oracle.graal.python.nodes.function;
 
-import com.oracle.graal.python.builtins.objects.function.PArguments;
-import com.oracle.graal.python.builtins.objects.function.PythonCallable;
-import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.PBaseNode;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.SpecialAttributeNames;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
-import com.oracle.graal.python.nodes.call.InvokeNode;
 import com.oracle.graal.python.runtime.PythonOptions;
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.ImportStatic;
 
 @ImportStatic({PGuards.class, PythonOptions.class, SpecialMethodNames.class, SpecialAttributeNames.class, BuiltinNames.class})
 public abstract class PythonBuiltinBaseNode extends PBaseNode {
-    @TruffleBoundary
-    public static String callAttributeSlowPath(PythonObject obj, String attributeId) {
-        Object object = obj.getPythonClass().getAttribute(attributeId);
-        PythonCallable callable;
-        if (object instanceof PythonCallable) {
-            callable = (PythonCallable) object;
-        } else {
-            callable = PythonCallable.require(obj.getAttribute(attributeId));
-        }
-        Object[] arguments = PArguments.create(1);
-        PArguments.setArgument(arguments, 0, obj);
-        InvokeNode invokeNode = InvokeNode.create(callable);
-        return invokeNode.invoke(arguments).toString();
-    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetClassNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetClassNode.java
@@ -39,6 +39,7 @@
 package com.oracle.graal.python.nodes.object;
 
 import com.oracle.graal.python.PythonLanguage;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PEllipsis;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
@@ -51,6 +52,7 @@
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
+import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNode;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -199,4 +201,12 @@ public static PythonClass getItSlowPath(Object o) {
         }
         return PythonLanguage.getCore().lookupType(o.getClass());
     }
+
+    @TruffleBoundary
+    public static String getNameSlowPath(Object o) {
+        if (PGuards.isForeignObject(o)) {
+            return BuiltinNames.FOREIGN;
+        }
+        return PythonBuiltinClassType.fromClass(o.getClass()).name();
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/ErrorMessageFormatter.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/ErrorMessageFormatter.java
@@ -42,7 +42,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 
 /**
@@ -81,13 +80,13 @@ public String format(GetClassNode getClassNode, String format, Object... args) {
         while (m.find(idx)) {
             String group = m.group();
             if ("%p".equals(group)) {
-                String name = getClass(getClassNode, args[matchIdx]).getName();
+                String name = getClassName(getClassNode, args[matchIdx]);
                 sb.replace(m.start() + offset, m.end() + offset, name);
                 offset += name.length() - (m.end() - m.start());
                 args[matchIdx] = REMOVED_MARKER;
                 removedCnt++;
             } else if ("%P".equals(group)) {
-                String name = getClass(getClassNode, args[matchIdx]).toString();
+                String name = "<class \'" + getClassName(getClassNode, args[matchIdx]) + "\'>";
                 sb.replace(m.start() + offset, m.end() + offset, name);
                 offset += name.length() - (m.end() - m.start());
                 args[matchIdx] = REMOVED_MARKER;
@@ -103,11 +102,11 @@ public String format(GetClassNode getClassNode, String format, Object... args) {
         return String.format(sb.toString(), compact(args, removedCnt));
     }
 
-    private static PythonClass getClass(GetClassNode getClassNode, Object obj) {
+    private static String getClassName(GetClassNode getClassNode, Object obj) {
         if (getClassNode != null) {
-            return getClassNode.execute(obj);
+            return getClassNode.execute(obj).getName();
         }
-        return GetClassNode.getItSlowPath(obj);
+        return GetClassNode.getNameSlowPath(obj);
     }
 
     private static Object[] compact(Object[] args, int removedCnt) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/PSequence.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/PSequence.java
@@ -25,14 +25,10 @@
  */
 package com.oracle.graal.python.runtime.sequence;
 
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
-
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
-import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
 import com.oracle.graal.python.builtins.objects.slice.PSlice.SliceInfo;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
-import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.runtime.JavaTypeConversions;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
@@ -73,8 +69,6 @@ public static String toString(Object item) {
             return "'" + item.toString() + "'";
         } else if (item instanceof Boolean) {
             return ((boolean) item ? "True" : "False");
-        } else if (item instanceof PythonObject) {
-            return PythonBuiltinNode.callAttributeSlowPath((PythonObject) item, __REPR__);
         } else if (item instanceof Double) {
             return JavaTypeConversions.doubleToString((double) item);
         } else {
