fix CI bug issue with unsigned values fitting long and zjit bindings stale

Author: AlexaCampusano

array.c

@@ -614,16 +614,16 @@ ary_fit_stride_batch(VALUE ary, const VALUE *argv, long argc)
     if (all_fix && ary_fixnum_fits_stride(lo, stride, uns) && ary_fixnum_fits_stride(hi, stride, uns)) {
         return;   /* everything fits as is */
     }
-    if (ARY_SHARED_P(ary)) rb_ary_cancel_sharing(ary);   /* see ary_fit_stride */
+    /* A view must not change the root's buffer: take a private copy first. */
+    if (ARY_SHARED_P(ary)) rb_ary_cancel_sharing(ary);
     if (!all_fix || (uns && lo < 0)) {
         rb_ary_widen(ary);         /* non-Fixnum, or negative into unsigned */
         return;
     }
-    /* Width these elements need, keeping the array's signedness: a signed
-     * array must stay signed even if every element here is non-negative. */
-    long range_lo = (!uns && lo >= 0) ? -1 : lo;
+    /* A signed array stays signed even if every element here is non-negative. */
+    if (!uns && lo >= 0) lo = -1;
     int need_uns;
-    int need = ary_stride_for_range(range_lo, hi, &need_uns);
+    int need = ary_stride_for_range(lo, hi, &need_uns);
     if (need == RARRAY_STRIDE_VALUE) {
         rb_ary_widen(ary);
     }
@@ -638,7 +638,8 @@ ary_fixnum_fits_stride(long v, int stride, int uns)
 {
     if (stride == RARRAY_STRIDE_VALUE) return true;
 
-    long min, max;
+    /* int64_t, not long: UINT32_MAX does not fit a 32-bit long (LLP64, i686). */
+    int64_t min, max;
     if (uns) {
         min = 0;
         switch (stride) {
@@ -989,36 +990,7 @@ ary_fit_stride(VALUE ary, VALUE elem)
     if (FIXNUM_P(elem) && ary_fixnum_fits_stride(FIX2LONG(elem), stride, rb_array_stride_unsigned_p(ary))) {
         return;   /* fits as is; a view may write in place into its root's buffer */
     }
-
-    /* The representation has to change.  A view must not do that to the
-     * root's buffer: take a private copy first. */
-    if (ARY_SHARED_P(ary)) rb_ary_cancel_sharing(ary);
-
-    if (!FIXNUM_P(elem)) {
-        rb_ary_widen(ary);
-        return;
-    }
-
-    long v = FIX2LONG(elem);
-    int uns = rb_array_stride_unsigned_p(ary);
-    if (ary_fixnum_fits_stride(v, stride, uns)) return;
-
-    int new_uns;
-    int needed = ary_stride_for_fixnum(v, &new_uns);
-
-    /* Sign mismatch: picking a signed width that also covers the existing
-     * elements needs a scan of the buffer. Widen for now. */
-    if (uns != new_uns) {
-        rb_ary_widen(ary);
-        return;
-    }
-
-    if (needed == RARRAY_STRIDE_VALUE) {
-        rb_ary_widen(ary);
-        return;
-    }
-
-    ary_promote_stride(ary, needed, uns);
+    ary_fit_stride_batch(ary, &elem, 1);
 }
 
 static void

test/ruby/test_array_stride.rb

@@ -881,14 +881,23 @@ def test_push_widens_above_32_bits
     assert_equal 2**40, a[-1]
   end
 
-  def test_push_of_opposite_sign_widens
-    # An unsigned array receiving a negative (or vice versa) widens rather
-    # than rescanning for a signed width.  Values must still round-trip.
-    a = pushed
-    a << -1
-    assert_equal WIDE, stride(a)
-    assert_equal -1, a[-1]
-    assert_equal (0...N).map { |i| i % 256 } + [-1], a
+  # [elements, value, stride after writing value]
+  SIGN_CHANGES = {
+    "signed W8 + positive"   => [->(i) { (i % 100) - 50 },      200,           W16],
+    "signed W16 + positive"  => [->(i) { (i % 100) * 300 - 15_000 }, 40_000,  W32],
+    "unsigned W8 + negative" => [->(i) { i % 256 },             -1,            WIDE],
+    "unsigned W16 + negative"=> [->(i) { i * 200 },             -1,            WIDE],
+  }
+
+  def test_opposite_sign_writes_match_for_single_and_batch
+    SIGN_CHANGES.each do |name, (blk, v, want)|
+      ref = (0...N).map(&blk)
+      single = pushed(&blk); single << v
+      batch  = pushed(&blk); batch.push(v, 1)
+      assert_equal ref + [v], single, name
+      assert_equal ref + [v, 1], batch, name
+      assert_equal [want, want], [stride(single), stride(batch)], name
+    end
   end
 
   def test_push_keeps_working_after_widening