Merge branch 'master' into truffle-head

jruby · May 3, 2015 · 2fb2788 · 2fb2788
2 parents ff7d4fe + b90754d
commit 2fb2788
Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/truffle/.factorypath b/truffle/.factorypath
@@ -1,4 +1,4 @@
 <factorypath>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/0.7-SNAPSHOT/truffle-0.7-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle-dsl-processor/0.7-SNAPSHOT/truffle-dsl-processor-0.7-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/0.7/truffle-0.7.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle-dsl-processor/0.7/truffle-dsl-processor-0.7.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>
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
@@ -110,7 +110,9 @@ public static boolean isSmallArrayOfPairs(Object[] args) {
                 return false;
             }
 
-            if (PackedArrayStrategy.MAX_ELEMENTS > PackedArrayStrategy.MAX_ENTRIES) {
+            final Object[] store = (Object[]) array.getStore();
+
+            if (store.length > PackedArrayStrategy.MAX_ENTRIES) {
                 return false;
             }