same id for empty tuples / frozensets / bytes objects

- added relevant unittests

Author: cosminbasca

graalpython/com.oracle.graal.python.test/src/tests/test_bytes.py

@@ -436,3 +436,8 @@ def test_find():
     assert b.find(i, 6) == 7
     assert b.find(i, 1, 3) == 1
     assert b.find(w, 1, 3) == -1
+
+
+def test_same_id():
+    empty_ids = set([id(bytes()) for i in range(100)])
+    assert len(empty_ids) == 1

graalpython/com.oracle.graal.python.test/src/tests/test_set.py

@@ -210,3 +210,8 @@ def test_intersection():
     #     assert id(s) == id(z)
     # else:
     #     assert id(s) != id(z)
+
+
+def test_same_id():
+    empty_ids = set([id(frozenset()) for i in range(100)])
+    assert len(empty_ids) == 1

graalpython/com.oracle.graal.python.test/src/tests/test_tuple.py

@@ -3,7 +3,6 @@
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 import seq_tests
-import unittest
 #import pickle
 from compare import CompareTest
 
@@ -374,3 +373,8 @@ def test_slice(self):
         t1 = tuple(range (1, 22, 2))
         s = slice(2, 6)
         self.assertEqual(t1[s], (5, 7, 9, 11))
+
+
+def test_same_id():
+    empty_ids = set([id(tuple()) for i in range(100)])
+    assert len(empty_ids) == 1

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

@@ -44,6 +44,7 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.TUPLE;
 import static com.oracle.graal.python.nodes.BuiltinNames.TYPE;
 import static com.oracle.graal.python.nodes.BuiltinNames.ZIP;
+import static com.oracle.graal.python.nodes.HiddenAttributes.ID_KEY;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__FILE__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.NotImplementedError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
@@ -169,9 +170,17 @@ protected List<com.oracle.truffle.api.dsl.NodeFactory<? extends PythonBuiltinBas
     @GenerateNodeFactory
     public abstract static class BytesNode extends PythonBuiltinNode {
 
-        @Specialization
-        public PBytes bytes(PythonClass cls, @SuppressWarnings("unused") PNone source, @SuppressWarnings("unused") PNone encoding, @SuppressWarnings("unused") PNone errors) {
-            return factory().createBytes(cls, new byte[0]);
+        protected long getEmptyId() {
+            return getContext().getEmptyBytesId();
+        }
+
+        @Specialization(guards = "isNoValue(source)")
+        public PBytes bytes(PythonClass cls, @SuppressWarnings("unused") PNone source, @SuppressWarnings("unused") PNone encoding, @SuppressWarnings("unused") PNone errors,
+                        @Cached("create()") WriteAttributeToObjectNode writeId,
+                        @Cached("getEmptyId()") long emptyId) {
+            PBytes emptyBytes = factory().createBytes(cls, new byte[0]);
+            writeId.execute(emptyBytes, ID_KEY, emptyId);
+            return emptyBytes;
         }
 
         @Specialization
@@ -553,9 +562,17 @@ public abstract static class FrozenSetNode extends PythonBuiltinNode {
 
         @Child private HashingStorageNodes.SetItemNode setItemNode;
 
+        protected long getEmptyId() {
+            return getContext().getEmptyFrozenSetId();
+        }
+
         @Specialization(guards = "isNoValue(arg)")
-        public PFrozenSet frozensetEmpty(PythonClass cls, @SuppressWarnings("unused") PNone arg) {
-            return factory().createFrozenSet(cls);
+        public PFrozenSet frozensetEmpty(PythonClass cls, @SuppressWarnings("unused") PNone arg,
+                        @Cached("create()") WriteAttributeToObjectNode writeId,
+                        @Cached("getEmptyId()") long emptyId) {
+            PFrozenSet frozenSet = factory().createFrozenSet(cls);
+            writeId.execute(frozenSet, ID_KEY, emptyId);
+            return frozenSet;
         }
 
         @Specialization

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/TupleNodes.java

@@ -40,6 +40,8 @@
  */
 package com.oracle.graal.python.nodes.builtins;
 
+import static com.oracle.graal.python.nodes.HiddenAttributes.ID_KEY;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -50,6 +52,7 @@
 import com.oracle.graal.python.nodes.PBaseNode;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
+import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
 import com.oracle.graal.python.nodes.control.GetIteratorNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
@@ -84,10 +87,17 @@ public final PTuple execute(Object value) {
 
         public abstract PTuple execute(Object cls, Object value);
 
+        protected long getEmptyId() {
+            return getContext().getEmptyTupleId();
+        }
+
         @Specialization(guards = "isNoValue(none)")
-        @SuppressWarnings("unused")
-        public PTuple tuple(PythonClass cls, PNone none) {
-            return factory().createEmptyTuple(cls);
+        public PTuple tuple(PythonClass cls, @SuppressWarnings("unused") PNone none,
+                        @Cached("create()") WriteAttributeToObjectNode writeId,
+                        @Cached("getEmptyId()") long emptyId) {
+            PTuple emptyTuple = factory().createEmptyTuple(cls);
+            writeId.execute(emptyTuple, ID_KEY, emptyId);
+            return emptyTuple;
         }
 
         @Specialization

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -58,14 +58,13 @@ public class PythonContext {
     private final HashMap<Object, CallTarget> atExitHooks = new HashMap<>();
     private final AtomicLong globalId = new AtomicLong(Integer.MAX_VALUE * 2L + 4L);
 
-    enum PythonBuiltinImmutableType {
+    public enum PythonImmutableBuiltinType {
         PFrozenSet,
         PTuple,
-        PBytes,
-        PString
+        PBytes
     }
 
-    private final long[] emptyImmutableObjectsIdCache = new long[PythonBuiltinImmutableType.values().length];
+    private final long[] emptyImmutableObjectsIdCache = new long[PythonImmutableBuiltinType.values().length];
 
     @CompilationFinal private TruffleLanguage.Env env;
 
@@ -100,7 +99,19 @@ public PythonContext(PythonLanguage language, TruffleLanguage.Env env, PythonCor
         }
     }
 
-    public long getEmptyImmutableObjectGlobalId(PythonBuiltinImmutableType immutableType) {
+    public long getEmptyFrozenSetId() {
+        return getEmptyImmutableObjectGlobalId(PythonImmutableBuiltinType.PFrozenSet);
+    }
+
+    public long getEmptyTupleId() {
+        return getEmptyImmutableObjectGlobalId(PythonImmutableBuiltinType.PTuple);
+    }
+
+    public long getEmptyBytesId() {
+        return getEmptyImmutableObjectGlobalId(PythonImmutableBuiltinType.PBytes);
+    }
+
+    private long getEmptyImmutableObjectGlobalId(PythonImmutableBuiltinType immutableType) {
         int idx = immutableType.ordinal();
         if (emptyImmutableObjectsIdCache[idx] == 0) {
             synchronized (emptyImmutableObjectsIdCache) {