[Truffle] Abstract hash to index.

jruby · Jan 8, 2015 · 33a84f2 · 33a84f2
1 parent efe40f5
commit 33a84f2
Showing 4 changed files with 11 additions and 192 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/PassthroughNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/PassthroughNode.java
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/FixnumLowerNode.java b/core/src/main/java/org/jruby/truffle/nodes/core/FixnumLowerNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. This
  * code is released under a tri EPL/GPL/LGPL license. You can use it,
  * redistribute it and/or modify it under the terms of the:
  *
@@ -13,14 +13,15 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import org.jruby.truffle.nodes.RubyNode;
-import org.jruby.truffle.nodes.control.PassthroughNode;
 import org.jruby.truffle.runtime.UndefinedPlaceholder;
 import org.jruby.truffle.runtime.control.RaiseException;
 import org.jruby.truffle.runtime.core.CoreLibrary;
 import org.jruby.truffle.runtime.core.RubyBasicObject;
 import org.jruby.truffle.runtime.core.RubyRange;
 
-public class FixnumLowerNode extends PassthroughNode {
+public class FixnumLowerNode extends RubyNode {
+
+    @Child private RubyNode child;
 
     @CompilerDirectives.CompilationFinal private boolean hasSeenInteger = false;
     @CompilerDirectives.CompilationFinal private boolean hasSeenLong = false;
@@ -32,7 +33,8 @@ public class FixnumLowerNode extends PassthroughNode {
     @CompilerDirectives.CompilationFinal private boolean hasNeededToLowerLongFixnumRange = false;
 
     public FixnumLowerNode(RubyNode child) {
-        super(child);
+        super(child.getContext(), child.getEncapsulatingSourceSection());
+        this.child = child;
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/truffle/nodes/hash/FindEntryNode.java b/core/src/main/java/org/jruby/truffle/nodes/hash/FindEntryNode.java
@@ -45,7 +45,7 @@ public HashSearchResult search(VirtualFrame frame, RubyHash hash, Object key) {
         }
 
         final Entry[] entries = (Entry[]) hash.getStore();
-        final int index = (hashed & HashOperations.SIGN_BIT_MASK) % entries.length;
+        final int index = HashOperations.getIndex(hashed, entries.length);
         Entry entry = entries[index];
 
         Entry previousEntry = null;

diff --git a/core/src/main/java/org/jruby/truffle/runtime/hash/HashOperations.java b/core/src/main/java/org/jruby/truffle/runtime/hash/HashOperations.java
@@ -212,4 +212,8 @@ public static void verySlowSetKeyValues(RubyHash hash, List<KeyValue> keyValues)
 
         hash.setSize(actualSize);
     }
+
+    public static int getIndex(int hashed, int entriesLength) {
+        return (hashed & HashOperations.SIGN_BIT_MASK) % entriesLength;
+    }
 }