jruby · May 1, 2015 · May 1, 2015 · May 1, 2015
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/HashCoreMethodNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/HashCoreMethodNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/HashGuards.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/HashGuards.java
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/hash/FindEntryNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/hash/FindEntryNode.java
@@ -60,19 +60,19 @@ public HashSearchResult search(VirtualFrame frame, RubyHash hash, Object key) {
         while (entry != null) {
             if (byIdentityProfile.profile(hash.isCompareByIdentity())) {
                 if (equalNode.executeReferenceEqual(frame, key, entry.getKey())) {
-                    return new HashSearchResult(index, previousEntry, entry);
+                    return new HashSearchResult(hashed, index, previousEntry, entry);
                 }
             } else {
                 if (eqlNode.callBoolean(frame, key, "eql?", null, entry.getKey())) {
-                    return new HashSearchResult(index, previousEntry, entry);
+                    return new HashSearchResult(hashed, index, previousEntry, entry);
                 }
             }
 
             previousEntry = entry;
             entry = entry.getNextInLookup();
         }
 
-        return new HashSearchResult(index, previousEntry, null);
+        return new HashSearchResult(hashed, index, previousEntry, null);
     }
 
     @Override

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/hash/Entry.java b/truffle/src/main/java/org/jruby/truffle/runtime/hash/Entry.java
@@ -15,6 +15,7 @@
  */
 public class Entry {
 
+    private int hashed;
     private Object key;
     private Object value;
 
@@ -23,11 +24,20 @@ public class Entry {
     private Entry previousInSequence;
     private Entry nextInSequence;
 
-    public Entry(Object key, Object value) {
+    public Entry(int hashed, Object key, Object value) {
+        this.hashed = hashed;
         this.key = key;
         this.value = value;
     }
 
+    public int getHashed() {
+        return hashed;
+    }
+
+    public void setHashed(int hashed) {
+        this.hashed = hashed;
+    }
+
     public Object getKey() {
         return key;
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/hash/HashOperations.java b/truffle/src/main/java/org/jruby/truffle/runtime/hash/HashOperations.java
@@ -157,19 +157,19 @@ public static HashSearchResult verySlowFindBucket(RubyHash hash, Object key, boo
             }
 
             if ((boolean) DebugOperations.send(hash.getContext(), key, method, null, entry.getKey())) {
-                return new HashSearchResult(bucketIndex, previousEntry, entry);
+                return new HashSearchResult(hashed, bucketIndex, previousEntry, entry);
             }
 
             previousEntry = entry;
             entry = entry.getNextInLookup();
         }
 
-        return new HashSearchResult(bucketIndex, previousEntry, null);
+        return new HashSearchResult(hashed, bucketIndex, previousEntry, null);
     }
 
     public static void setAtBucket(RubyHash hash, HashSearchResult hashSearchResult, Object key, Object value) {
         if (hashSearchResult.getEntry() == null) {
-            final Entry entry = new Entry(key, value);
+            final Entry entry = new Entry(hashSearchResult.getHashed(), key, value);
 
             if (hashSearchResult.getPreviousEntry() == null) {
                 ((Entry[]) hash.getStore())[hashSearchResult.getIndex()] = entry;
@@ -192,6 +192,7 @@ public static void setAtBucket(RubyHash hash, HashSearchResult hashSearchResult,
 
             // Update the key (it overwrites even it it's eql?) and value
 
+            entry.setHashed(hashSearchResult.getHashed());
             entry.setKey(key);
             entry.setValue(value);
         }

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/hash/HashSearchResult.java b/truffle/src/main/java/org/jruby/truffle/runtime/hash/HashSearchResult.java
@@ -25,16 +25,22 @@
  */
 public class HashSearchResult {
 
+    private final int hashed;
+    private final int index;
     private final Entry previousEntry;
     private final Entry entry;
-    private final int index;
 
-    public HashSearchResult(int index, Entry previousEntry, Entry entry) {
+    public HashSearchResult(int hashed, int index, Entry previousEntry, Entry entry) {
+        this.hashed = hashed;
         this.index = index;
         this.previousEntry = previousEntry;
         this.entry = entry;
     }
 
+    public int getHashed() {
+        return hashed;
+    }
+
     public int getIndex() {
         return index;
     }