[GR-24462] Eliminate coerce_to_collection{index, length}.

PullRequest: truffleruby/1742

Author: eregon

spec/ruby/core/array/fill_spec.rb

@@ -207,8 +207,9 @@
 
   not_supported_on :opal do
     it "raises an ArgumentError or RangeError for too-large sizes" do
+      error_types = [RangeError, ArgumentError]
       arr = [1, 2, 3]
-      -> { arr.fill(10, 1, fixnum_max) }.should raise_error(ArgumentError)
+      -> { arr.fill(10, 1, fixnum_max) }.should raise_error { |err| error_types.should include(err.class) }
       -> { arr.fill(10, 1, bignum_value) }.should raise_error(RangeError)
     end
   end

src/main/java/org/truffleruby/core/VMPrimitiveNodes.java

@@ -437,11 +437,11 @@ protected long startHashBigNum(DynamicObject salt) {
 
         @Specialization(guards = "!isRubyNumber(salt)")
         protected Object startHashNotNumber(Object salt,
-                @Cached ToRubyIntegerNode toInteger,
+                @Cached ToRubyIntegerNode toRubyInteger,
                 @Cached ConditionProfile isIntegerProfile,
                 @Cached ConditionProfile isLongProfile,
                 @Cached ConditionProfile isBignumProfile) {
-            Object result = toInteger.execute(salt);
+            Object result = toRubyInteger.execute(salt);
             if (isIntegerProfile.profile(result instanceof Integer)) {
                 return getContext().getHashing(this).start((int) result);
             } else if (isLongProfile.profile(result instanceof Long)) {
@@ -470,11 +470,11 @@ protected long updateHash(long hash, DynamicObject value) {
 
         @Specialization(guards = "!isRubyNumber(value)")
         protected Object updateHash(long hash, Object value,
-                @Cached ToRubyIntegerNode toInteger,
+                @Cached ToRubyIntegerNode toRubyInteger,
                 @Cached ConditionProfile isIntegerProfile,
                 @Cached ConditionProfile isLongProfile,
                 @Cached ConditionProfile isBignumProfile) {
-            Object result = toInteger.execute(value);
+            Object result = toRubyInteger.execute(value);
             if (isIntegerProfile.profile(result instanceof Integer)) {
                 return Hashing.update(hash, (int) result);
             } else if (isLongProfile.profile(result instanceof Long)) {

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

@@ -23,7 +23,7 @@ public class HashNode extends RubyContextNode {
 
     @Child private CallDispatchHeadNode hashNode;
     @Child private ObjectIDNode objectIDNode;
-    @Child ToRubyIntegerNode toInteger;
+    @Child private ToRubyIntegerNode toRubyInteger;
 
     private final ConditionProfile isIntegerProfile1 = ConditionProfile.create();
     private final ConditionProfile isLongProfile1 = ConditionProfile.create();
@@ -47,12 +47,12 @@ public int hash(Object key, boolean compareByIdentity) {
         } else if (isBignumProfile1.profile(Layouts.BIGNUM.isBignum(hashedObject))) {
             return BigIntegerOps.hashCode(hashedObject);
         } else {
-            if (toInteger == null) {
+            if (toRubyInteger == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                toInteger = insert(ToRubyIntegerNode.create());
+                toRubyInteger = insert(ToRubyIntegerNode.create());
             }
 
-            final Object coercedHashedObject = toInteger.execute(hashedObject);
+            final Object coercedHashedObject = toRubyInteger.execute(hashedObject);
 
             if (isIntegerProfile2.profile(coercedHashedObject instanceof Integer)) {
                 return (int) coercedHashedObject;

src/main/ruby/truffleruby/core/array.rb

@@ -205,7 +205,7 @@ def bsearch_index
   end
 
   def combination(num)
-    num = Truffle::Type.coerce_to_collection_index num
+    num = Primitive.rb_num2int num
 
     unless block_given?
       return to_enum(:combination, num) do
@@ -271,7 +271,7 @@ def cycle(n = nil)
         each { |x| yield x }
       end
     else
-      n = Truffle::Type.coerce_to_collection_index n
+      n = Primitive.rb_num2int n
       n.times do
         each { |x| yield x }
       end
@@ -342,7 +342,7 @@ def empty?
 
   def fetch(idx, default=undefined)
     orig = idx
-    idx = Truffle::Type.coerce_to_collection_index idx
+    idx = Primitive.rb_num2int idx
 
     idx += size if idx < 0
 
@@ -392,15 +392,13 @@ def fetch(idx, default=undefined)
       return self if right <= left           # Nothing to modify
 
     elsif index
-      left = Truffle::Type.coerce_to_collection_length index
+      left = Primitive.rb_num2int index
       left += size if left < 0
       left = 0 if left < 0
 
       if !Primitive.undefined?(length) and length
         begin
-          right = Truffle::Type.coerce_to_collection_length length
-        rescue ArgumentError
-          raise RangeError, 'bignum too big to convert into `long'
+          right = Primitive.rb_num2int length
         rescue TypeError
           raise ArgumentError, 'second argument must be an Integer'
         end
@@ -435,14 +433,14 @@ def fetch(idx, default=undefined)
   def first(n = undefined)
     return at(0) if Primitive.undefined?(n)
 
-    n = Truffle::Type.coerce_to_collection_index(n)
+    n = Primitive.rb_num2int n
     raise ArgumentError, 'Size must be positive' if n < 0
 
     Array.new self[0, n]
   end
 
   def flatten(level=-1)
-    level = Truffle::Type.coerce_to_collection_index level
+    level = Primitive.rb_num2int level
     return self.dup if level == 0
 
     out = self.class.allocate # new_reserved size
@@ -454,7 +452,7 @@ def flatten(level=-1)
   def flatten!(level=-1)
     Primitive.check_frozen self
 
-    level = Truffle::Type.coerce_to_collection_index level
+    level = Primitive.rb_num2int level
     return nil if level == 0
 
     out = self.class.allocate # new_reserved size
@@ -531,7 +529,7 @@ def insert(idx, *items)
     Primitive.check_frozen self
     return self if items.length == 0
 
-    idx = Truffle::Type.coerce_to_collection_index idx
+    idx = Primitive.rb_num2int idx
     idx += (size + 1) if idx < 0    # Negatives add AFTER the element
     raise IndexError, "#{idx} out of bounds" if idx < 0
 
@@ -627,7 +625,7 @@ def last(n=undefined)
       return []
     end
 
-    n = Truffle::Type.coerce_to_collection_index n
+    n = Primitive.rb_num2int n
     return [] if n == 0
 
     raise ArgumentError, 'count must be positive' if n < 0
@@ -646,7 +644,7 @@ def permutation(num=undefined, &block)
     if Primitive.undefined? num
       num = size
     else
-      num = Truffle::Type.coerce_to_collection_index num
+      num = Primitive.rb_num2int num
     end
 
     if num < 0 || size < num
@@ -687,7 +685,7 @@ def permutation_size(num)
     if Primitive.undefined? num
       k = self.size
     else
-      k = Truffle::Type.coerce_to_collection_index num
+      k = Primitive.rb_num2int num
     end
     descending_factorial(n, k)
   end
@@ -905,7 +903,7 @@ def rindex(obj=undefined)
   end
 
   def rotate(n=1)
-    n = Truffle::Type.coerce_to_collection_index n
+    n = Primitive.rb_num2int n
 
     len = self.length
     return Array.new(self) if len <= 1
@@ -916,7 +914,7 @@ def rotate(n=1)
   end
 
   def rotate!(n=1)
-    n = Truffle::Type.coerce_to_collection_index n
+    n = Primitive.rb_num2int n
     Primitive.check_frozen self
 
     len = self.length
@@ -933,7 +931,7 @@ def initialize(rng)
     end
 
     def rand(size)
-      random = Truffle::Type.coerce_to_collection_index @rng.rand(size)
+      random = Primitive.rb_num2int @rng.rand(size)
       raise RangeError, 'random value must be >= 0' if random < 0
       raise RangeError, 'random value must be less than Array size' unless random < size
 
@@ -950,10 +948,10 @@ def sample(count=undefined, options=undefined)
         count = nil
       else
         options = nil
-        count = Truffle::Type.coerce_to_collection_index count
+        count = Primitive.rb_num2int count
       end
     else
-      count = Truffle::Type.coerce_to_collection_index count
+      count = Primitive.rb_num2int count
       options = Truffle::Type.coerce_to options, Hash, :to_hash
     end
 
@@ -1089,7 +1087,7 @@ def shuffle!(options = undefined)
   end
 
   def drop(n)
-    n = Truffle::Type.coerce_to_collection_index n
+    n = Primitive.rb_num2int n
     raise ArgumentError, 'attempt to drop negative size' if n < 0
 
     new_size = size - n
@@ -1175,15 +1173,15 @@ def unshift(*values)
   alias_method :prepend, :unshift
 
   private def range_begin(range)
-    first = Truffle::Type.coerce_to_collection_index range.begin
+    first = Primitive.rb_num2int range.begin
     first += size if first < 0
     first
   end
 
   private def range_end(range)
     last = range.end
     return size - 1 if Primitive.nil? last
-    last = Truffle::Type.coerce_to_collection_index last
+    last = Primitive.rb_num2int last
     last += size if last < 0
     last -=1 if range.exclude_end?
     last
@@ -1201,7 +1199,7 @@ def values_at(*args)
         next if finish < start
         start.upto(finish) { |i| out << at(i) }
       else
-        i = Truffle::Type.coerce_to_collection_index elem
+        i = Primitive.rb_num2int elem
         out << at(i)
       end
     end
@@ -1527,7 +1525,7 @@ def slice!(start, length=undefined)
       else
         # make sure that negative values are not passed through to the
         # []= assignment
-        start = Truffle::Type.coerce_to_collection_index start
+        start = Primitive.rb_num2int start
         start = start + size if start < 0
 
         # This is to match the MRI behaviour of not extending the array
@@ -1546,8 +1544,8 @@ def slice!(start, length=undefined)
         end
       end
     else
-      start = Truffle::Type.coerce_to_collection_index start
-      length = Truffle::Type.coerce_to_collection_length length
+      start = Primitive.rb_num2int start
+      length = Primitive.rb_num2int length
       return nil if length < 0
 
       out = self[start, length]

src/main/ruby/truffleruby/core/enumerable.rb

@@ -513,7 +513,7 @@ def cycle(many=nil)
     end
 
     if many
-      many = Truffle::Type.coerce_to_collection_index many
+      many = Primitive.rb_num2int many
       return nil if many <= 0
     else
       many = nil
@@ -545,7 +545,7 @@ def cycle(many=nil)
   end
 
   def drop(n)
-    n = Truffle::Type.coerce_to_collection_index n
+    n = Primitive.rb_num2int n
     raise ArgumentError, 'attempt to drop negative size' if n < 0
 
     ary = to_a
@@ -567,7 +567,7 @@ def drop_while
   end
 
   def each_cons(num)
-    n = Truffle::Type.coerce_to_collection_index num
+    n = Primitive.rb_num2int num
     raise ArgumentError, "invalid size: #{n}" if n <= 0
 
     unless block_given?
@@ -594,7 +594,7 @@ def each_cons(num)
   end
 
   def each_slice(slice_size)
-    n = Truffle::Type.coerce_to_collection_index slice_size
+    n = Primitive.rb_num2int slice_size
     raise ArgumentError, "invalid slice size: #{n}" if n <= 0
 
     unless block_given?
@@ -916,7 +916,7 @@ def reverse_each(&block)
   end
 
   def take(n)
-    n = Truffle::Type.coerce_to_collection_index n
+    n = Primitive.rb_num2int n
     raise ArgumentError, "attempt to take negative size: #{n}" if n < 0
 
     array = []

src/main/ruby/truffleruby/core/enumerable_helper.rb

@@ -30,7 +30,7 @@ module Truffle
   module EnumerableHelper
     def self.cycle_size(enum_size, many)
       if many
-        many = Truffle::Type.coerce_to_collection_index many
+        many = Primitive.rb_num2int many
         many = 0 if many < 0
         Primitive.nil?(enum_size) ? nil : enum_size * many
       else

src/main/ruby/truffleruby/core/type.rb

@@ -396,26 +396,6 @@ def self.clamp_to_int(n)
       end
     end
 
-    def self.coerce_to_collection_index(index)
-      if fits_into_long?(index)
-        index
-      else
-        index = Primitive.rb_to_int(index)
-        check_long(index)
-        index
-      end
-    end
-
-    def self.coerce_to_collection_length(length)
-      if fits_into_long?(length)
-        length
-      else
-        length = Primitive.rb_to_int(length)
-        check_long(length)
-        length
-      end
-    end
-
     def self.coerce_to_float(obj)
       case obj
       when Float