Skip to content

[pull] master from ruby:master #873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Mar 21, 2026
Merged

[pull] master from ruby:master #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abbb1b2
[ruby/prism] Swich identifiers to byte[]
headius Mar 19, 2026
7d31553
[ruby/prism] Tweaks for byte[] identifiers
headius Mar 20, 2026
251fd7a
ZJIT: Fold statically known GuardGreaterEq (#16487)
tenderlove Mar 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions prism/templates/template.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ module Template # :nodoc: all
REMOVE_ON_ERROR_TYPES = SERIALIZE_ONLY_SEMANTICS_FIELDS
CHECK_FIELD_KIND = ENV.fetch("CHECK_FIELD_KIND", false)

JAVA_BACKEND = ENV["PRISM_JAVA_BACKEND"] || "truffleruby"
JAVA_STRING_TYPE = JAVA_BACKEND == "jruby" ? "org.jruby.RubySymbol" : "String"
JAVA_BACKEND = ENV["PRISM_JAVA_BACKEND"] || "default"
JAVA_IDENTIFIER_TYPE = JAVA_BACKEND == "truffleruby" ? "String" : "byte[]"
INCLUDE_NODE_ID = !SERIALIZE_ONLY_SEMANTICS_FIELDS || JAVA_BACKEND == "jruby"

COMMON_FLAGS_COUNT = 2
Expand Down Expand Up @@ -272,7 +272,7 @@ def call_seq_type
end

def java_type
JAVA_STRING_TYPE
JAVA_IDENTIFIER_TYPE
end
end

Expand All @@ -292,7 +292,7 @@ def call_seq_type
end

def java_type
JAVA_STRING_TYPE
JAVA_IDENTIFIER_TYPE
end
end

Expand All @@ -312,7 +312,7 @@ def call_seq_type
end

def java_type
"#{JAVA_STRING_TYPE}[]"
"#{JAVA_IDENTIFIER_TYPE}[]"
end
end

Expand Down
12 changes: 12 additions & 0 deletions zjit/src/hir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5071,6 +5071,18 @@ impl Function {
_ => insn_id,
}
},
Insn::GuardGreaterEq { left, right, state, reason } => {
let left_num = self.type_of(left).cint64_value();
let right_num = self.type_of(right).cint64_value();
match (left_num, right_num) {
(Some(l), Some(r)) if l >= r => {
self.make_equal_to(insn_id, left);
continue
},
(Some(_), Some(_)) => self.new_insn(Insn::SideExit { state, reason }),
_ => insn_id,
}
},
Insn::GuardBitEquals { val, expected, .. } => {
let recv_type = self.type_of(val);
if recv_type.has_value(expected) {
Expand Down
97 changes: 68 additions & 29 deletions zjit/src/hir/opt_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,14 +1017,73 @@ mod hir_opt_tests {
v34:CInt64[0] = Const CInt64(0)
v29:CInt64 = ArrayLength v27
v30:CInt64[0] = GuardLess v34, v29
v31:CInt64[0] = Const CInt64(0)
v32:CInt64[0] = GuardGreaterEq v30, v31
v33:BasicObject = ArrayAref v27, v32
v33:BasicObject = ArrayAref v27, v30
CheckInterrupts
Return v33
");
}

#[test]
fn test_fold_guard_greater_eq() {
eval("
def test(arr) = arr[0]
test([1,2,3])
");
assert_snapshot!(hir_string("test"), @"
fn test@<compiled>:2:
bb1():
EntryPoint interpreter
v1:BasicObject = LoadSelf
v2:CPtr = LoadSP
v3:BasicObject = LoadField v2, :arr@0x1000
Jump bb3(v1, v3)
bb2():
EntryPoint JIT(0)
v6:BasicObject = LoadArg :self@0
v7:BasicObject = LoadArg :arr@1
Jump bb3(v6, v7)
bb3(v9:BasicObject, v10:BasicObject):
v15:Fixnum[0] = Const Value(0)
PatchPoint NoSingletonClass(Array@0x1008)
PatchPoint MethodRedefined(Array@0x1008, []@0x1010, cme:0x1018)
v27:ArrayExact = GuardType v10, ArrayExact
v34:CInt64[0] = Const CInt64(0)
v29:CInt64 = ArrayLength v27
v30:CInt64[0] = GuardLess v34, v29
v33:BasicObject = ArrayAref v27, v30
CheckInterrupts
Return v33
");
}

#[test]
fn test_fold_guard_greater_eq_side_exit() {
eval(r##"
def test = [4,5,6].freeze[-10]
"##);
assert_snapshot!(hir_string("test"), @"
fn test@<compiled>:2:
bb1():
EntryPoint interpreter
v1:BasicObject = LoadSelf
Jump bb3(v1)
bb2():
EntryPoint JIT(0)
v4:BasicObject = LoadArg :self@0
Jump bb3(v4)
bb3(v6:BasicObject):
PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE)
v11:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000))
v13:Fixnum[-10] = Const Value(-10)
PatchPoint NoSingletonClass(Array@0x1008)
PatchPoint MethodRedefined(Array@0x1008, []@0x1010, cme:0x1018)
v31:CInt64[-10] = Const CInt64(-10)
v26:CInt64 = ArrayLength v11
v27:CInt64[-10] = GuardLess v31, v26
SideExit GuardGreaterEq
");
}

#[test]
fn neq_with_side_effect_not_elided () {
let result = eval("
Expand Down Expand Up @@ -2287,9 +2346,7 @@ mod hir_opt_tests {
v34:CInt64[0] = Const CInt64(0)
v29:CInt64 = ArrayLength v27
v30:CInt64[0] = GuardLess v34, v29
v31:CInt64[0] = Const CInt64(0)
v32:CInt64[0] = GuardGreaterEq v30, v31
v33:BasicObject = ArrayAref v27, v32
v33:BasicObject = ArrayAref v27, v30
CheckInterrupts
Return v33
");
Expand Down Expand Up @@ -5998,9 +6055,7 @@ mod hir_opt_tests {
v33:CInt64[0] = Const CInt64(0)
v28:CInt64 = ArrayLength v23
v29:CInt64[0] = GuardLess v33, v28
v30:CInt64[0] = Const CInt64(0)
v31:CInt64[0] = GuardGreaterEq v29, v30
v32:BasicObject = ArrayAref v23, v31
v32:BasicObject = ArrayAref v23, v29
CheckInterrupts
Return v32
");
Expand Down Expand Up @@ -6032,8 +6087,6 @@ mod hir_opt_tests {
v31:CInt64[1] = Const CInt64(1)
v26:CInt64 = ArrayLength v11
v27:CInt64[1] = GuardLess v31, v26
v28:CInt64[0] = Const CInt64(0)
v29:CInt64[1] = GuardGreaterEq v27, v28
v32:Fixnum[5] = Const Value(5)
CheckInterrupts
Return v32
Expand Down Expand Up @@ -6064,11 +6117,7 @@ mod hir_opt_tests {
v31:CInt64[-3] = Const CInt64(-3)
v26:CInt64 = ArrayLength v11
v27:CInt64[-3] = GuardLess v31, v26
v28:CInt64[0] = Const CInt64(0)
v29:CInt64[-3] = GuardGreaterEq v27, v28
v32:Fixnum[4] = Const Value(4)
CheckInterrupts
Return v32
SideExit GuardGreaterEq
");
}

Expand Down Expand Up @@ -6096,11 +6145,7 @@ mod hir_opt_tests {
v31:CInt64[-10] = Const CInt64(-10)
v26:CInt64 = ArrayLength v11
v27:CInt64[-10] = GuardLess v31, v26
v28:CInt64[0] = Const CInt64(0)
v29:CInt64[-10] = GuardGreaterEq v27, v28
v32:NilClass = Const Value(nil)
CheckInterrupts
Return v32
SideExit GuardGreaterEq
");
}

Expand Down Expand Up @@ -6128,8 +6173,6 @@ mod hir_opt_tests {
v31:CInt64[10] = Const CInt64(10)
v26:CInt64 = ArrayLength v11
v27:CInt64[10] = GuardLess v31, v26
v28:CInt64[0] = Const CInt64(0)
v29:CInt64[10] = GuardGreaterEq v27, v28
v32:NilClass = Const Value(nil)
CheckInterrupts
Return v32
Expand Down Expand Up @@ -8362,9 +8405,7 @@ mod hir_opt_tests {
v37:CInt64[0] = Const CInt64(0)
v32:CInt64 = ArrayLength v14
v33:CInt64[0] = GuardLess v37, v32
v34:CInt64[0] = Const CInt64(0)
v35:CInt64[0] = GuardGreaterEq v33, v34
v36:BasicObject = ArrayAref v14, v35
v36:BasicObject = ArrayAref v14, v33
CheckInterrupts
Return v36
");
Expand Down Expand Up @@ -8744,9 +8785,7 @@ mod hir_opt_tests {
v45:CInt64[1] = Const CInt64(1)
v39:CInt64 = ArrayLength v33
v40:CInt64[1] = GuardLess v45, v39
v41:CInt64[0] = Const CInt64(0)
v42:CInt64[1] = GuardGreaterEq v40, v41
ArrayAset v33, v42, v19
ArrayAset v33, v40, v19
WriteBarrier v33, v19
CheckInterrupts
Return v19
Expand Down