Handle self-recursion for foreign container objects

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictReprBuiltin.java

@@ -101,6 +101,9 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.LoopNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
@@ -281,13 +284,27 @@ public static ReprState dict(Frame frame, @SuppressWarnings("unused") Node node,
                                                       // library
         public static TruffleString repr(Object dict,
                         @Bind("this") Node inliningTarget,
+                        @CachedLibrary(limit = "2") InteropLibrary interopLib,
                         @Cached DictNodes.GetDictStorageNode getStorageNode,
                         @Cached("create(3)") ForEachDictRepr consumerNode,
                         @Shared @Cached HashingStorageForEach forEachNode,
                         @Shared @Cached TruffleStringBuilder.AppendStringNode appendStringNode,
                         @Shared @Cached TruffleStringBuilder.ToStringNode toStringNode) {
             PythonContext ctxt = PythonContext.get(forEachNode);
-            if (!ctxt.reprEnter(dict)) {
+            Object reprIdentity = dict;
+            if (!PGuards.isAnyPythonObject(dict)) {
+                // The interop library dispatch initialization acts as branch profile. Hash codes
+                // may clash, but in this case the only downside is that we print an ellipsis
+                // instead of expanding more.
+                if (interopLib.hasIdentity(dict)) {
+                    try {
+                        reprIdentity = interopLib.identityHashCode(dict);
+                    } catch (UnsupportedMessageException e) {
+                        throw CompilerDirectives.shouldNotReachHere(e);
+                    }
+                }
+            }
+            if (!ctxt.reprEnter(reprIdentity)) {
                 return T_ELLIPSIS_IN_BRACES;
             }
             try {
@@ -298,7 +315,7 @@ public static TruffleString repr(Object dict,
                 appendStringNode.execute(sb, T_RBRACE);
                 return toStringNode.execute(sb);
             } finally {
-                ctxt.reprLeave(dict);
+                ctxt.reprLeave(reprIdentity);
             }
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java

@@ -89,6 +89,7 @@
 import com.oracle.graal.python.lib.PyObjectRichCompareBool;
 import com.oracle.graal.python.lib.RichCmpOp;
 import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.builtins.ListNodes;
 import com.oracle.graal.python.nodes.builtins.ListNodes.AppendNode;
@@ -113,6 +114,7 @@
 import com.oracle.graal.python.runtime.sequence.storage.IntSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.LongSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.HostCompilerDirectives.InliningCutoff;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
@@ -124,6 +126,9 @@
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.LoopNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
@@ -184,6 +189,7 @@ abstract static class ReprNode extends PythonUnaryBuiltinNode {
         public TruffleString repr(VirtualFrame frame, Object self,
                         @Bind("this") Node inliningTarget,
                         @Cached GetListStorageNode getStorageNode,
+                        @CachedLibrary(limit = "2") InteropLibrary interopLib,
                         @Cached SequenceStorageNodes.GetItemNode getItem,
                         @Cached PyObjectReprAsTruffleStringNode reprNode,
                         @Cached TruffleStringBuilder.AppendStringNode appendStringNode,
@@ -193,7 +199,21 @@ public TruffleString repr(VirtualFrame frame, Object self,
             if (length == 0) {
                 return T_EMPTY_BRACKETS;
             }
-            if (!PythonContext.get(this).reprEnter(self)) {
+            Object reprIdentity = self;
+            if (!PGuards.isAnyPythonObject(self)) {
+                // The interop library dispatch initialization acts as branch profile. Hash codes
+                // may clash, but in this case the only downside is that we print an ellipsis
+                // instead of expanding more.
+                if (interopLib.hasIdentity(self)) {
+                    try {
+                        reprIdentity = interopLib.identityHashCode(self);
+                    } catch (UnsupportedMessageException e) {
+                        throw CompilerDirectives.shouldNotReachHere(e);
+                    }
+                }
+            }
+            PythonContext context = PythonContext.get(this);
+            if (!context.reprEnter(reprIdentity)) {
                 return T_ELLIPSIS_IN_BRACKETS;
             }
             try {
@@ -212,7 +232,7 @@ public TruffleString repr(VirtualFrame frame, Object self,
                 appendStringNode.execute(buf, T_RBRACKET);
                 return toStringNode.execute(buf);
             } finally {
-                PythonContext.get(this).reprLeave(self);
+                context.reprLeave(reprIdentity);
             }
         }
     }