[GR-32640] Read entries from the Hash only once

PullRequest: truffleruby/2810

Author: eregon

src/main/java/org/truffleruby/core/hash/HashNodes.java

@@ -58,7 +58,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {
         protected RubyHash allocate(RubyClass rubyClass) {
             final Shape shape = getLanguage().hashShape;
             final EmptyHashStore store = EmptyHashStore.NULL_HASH_STORE;
-            final RubyHash hash = new RubyHash(rubyClass, shape, getContext(), store, 0, null, null, nil, nil, false);
+            final RubyHash hash = new RubyHash(rubyClass, shape, getContext(), store, 0);
             AllocationTracing.trace(hash, this);
             return hash;
         }
@@ -109,7 +109,7 @@ protected Object construct(RubyClass hashClass, Object[] args,
             }
 
             final Shape shape = getLanguage().hashShape;
-            return new RubyHash(hashClass, shape, getContext(), newStore, size, null, null, nil, nil, false);
+            return new RubyHash(hashClass, shape, getContext(), newStore, size);
         }
 
         @Specialization(guards = "!isSmallArrayOfPairs(args, getLanguage())")

src/main/java/org/truffleruby/core/hash/HashOperations.java

@@ -14,24 +14,17 @@
 import org.truffleruby.core.hash.library.EmptyHashStore;
 import org.truffleruby.core.numeric.BigIntegerOps;
 import org.truffleruby.core.numeric.RubyBignum;
-import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyBaseNode;
 
 public abstract class HashOperations {
 
     public static RubyHash newEmptyHash(RubyContext context, RubyLanguage language) {
-        final Object nil = Nil.INSTANCE;
         return new RubyHash(
                 context.getCoreLibrary().hashClass,
                 language.hashShape,
                 context,
                 EmptyHashStore.NULL_HASH_STORE,
-                0,
-                null,
-                null,
-                nil,
-                nil,
-                false);
+                0);
     }
 
     // random number, stops hashes for similar values but different classes being the same, static because we want deterministic hashes

src/main/java/org/truffleruby/core/hash/RubyHash.java

@@ -32,6 +32,7 @@
 import org.truffleruby.core.hash.library.HashStoreLibrary;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.interop.ForeignToRubyNode;
+import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.dispatch.DispatchNode;
 import org.truffleruby.language.library.RubyLibrary;
@@ -42,12 +43,10 @@
 @ImportStatic(HashGuards.class)
 public class RubyHash extends RubyDynamicObject implements ObjectGraphNode {
 
-    public Object defaultBlock;
-    public Object defaultValue;
     public Object store;
     public int size;
-    public Entry firstInSequence;
-    public Entry lastInSequence;
+    public Object defaultBlock;
+    public Object defaultValue;
     public boolean compareByIdentity;
     public boolean ruby2_keywords = false;
 
@@ -56,20 +55,13 @@ public RubyHash(
             Shape shape,
             RubyContext context,
             Object store,
-            int size,
-            Entry firstInSequence,
-            Entry lastInSequence,
-            Object defaultBlock,
-            Object defaultValue,
-            boolean compareByIdentity) {
+            int size) {
         super(rubyClass, shape);
-        this.defaultBlock = defaultBlock;
-        this.defaultValue = defaultValue;
         this.store = store;
         this.size = size;
-        this.firstInSequence = firstInSequence;
-        this.lastInSequence = lastInSequence;
-        this.compareByIdentity = compareByIdentity;
+        this.defaultBlock = Nil.INSTANCE;
+        this.defaultValue = Nil.INSTANCE;
+        this.compareByIdentity = false;
 
         if (context.isPreInitializing()) {
             context.getPreInitializationManager().addPreInitHash(this);
@@ -79,7 +71,7 @@ public RubyHash(
     @TruffleBoundary
     public void getAdjacentObjects(Set<Object> reachable) {
         if (store instanceof BucketsHashStore) {
-            BucketsHashStore.getAdjacentObjects(reachable, firstInSequence);
+            ((BucketsHashStore) store).getAdjacentObjects(reachable);
         } else {
             ObjectGraph.addProperty(reachable, store);
         }