Skip to content

Commit 799d57b

Browse files
committed
insns.def: Drop unused leafness_of_check_ints
It was used to let MJIT override the leafness of the instruction when it decides to remove check_ints for it. Now that MJIT is gone, nobody needs to "override" the leafness using this.
1 parent 6c88b71 commit 799d57b

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

insns.def

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ jump
12061206
()
12071207
()
12081208
/* Same discussion as leave. */
1209-
// attr bool leaf = leafness_of_check_ints; /* has rb_threadptr_execute_interrupts() */
1209+
// attr bool leaf = false; /* has rb_threadptr_execute_interrupts() */
12101210
{
12111211
RUBY_VM_CHECK_INTS(ec);
12121212
JUMP(dst);
@@ -1219,7 +1219,7 @@ branchif
12191219
(VALUE val)
12201220
()
12211221
/* Same discussion as jump. */
1222-
// attr bool leaf = leafness_of_check_ints; /* has rb_threadptr_execute_interrupts() */
1222+
// attr bool leaf = false; /* has rb_threadptr_execute_interrupts() */
12231223
{
12241224
if (RTEST(val)) {
12251225
RUBY_VM_CHECK_INTS(ec);
@@ -1234,7 +1234,7 @@ branchunless
12341234
(VALUE val)
12351235
()
12361236
/* Same discussion as jump. */
1237-
// attr bool leaf = leafness_of_check_ints; /* has rb_threadptr_execute_interrupts() */
1237+
// attr bool leaf = false; /* has rb_threadptr_execute_interrupts() */
12381238
{
12391239
if (!RTEST(val)) {
12401240
RUBY_VM_CHECK_INTS(ec);
@@ -1249,7 +1249,7 @@ branchnil
12491249
(VALUE val)
12501250
()
12511251
/* Same discussion as jump. */
1252-
// attr bool leaf = leafness_of_check_ints; /* has rb_threadptr_execute_interrupts() */
1252+
// attr bool leaf = false; /* has rb_threadptr_execute_interrupts() */
12531253
{
12541254
if (NIL_P(val)) {
12551255
RUBY_VM_CHECK_INTS(ec);

tool/ruby_vm/models/bare_instructions.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ def always_leaf?
111111
@attrs.fetch('leaf').expr.expr == 'true;'
112112
end
113113

114-
def leaf_without_check_ints?
115-
@attrs.fetch('leaf').expr.expr == 'leafness_of_check_ints;'
116-
end
117-
118114
def handle_canary stmt
119115
# Stack canary is basically a good thing that we want to add, however:
120116
#

tool/ruby_vm/views/_leaf_helpers.erb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010

1111
#include "iseq.h"
1212

13-
// This is used to tell JIT that this insn would be leaf if CHECK_INTS didn't exist.
14-
// It should be used only when RUBY_VM_CHECK_INTS is directly written in insns.def.
15-
static bool leafness_of_check_ints = false;
16-
1713
static bool
1814
leafness_of_defined(rb_num_t op_type)
1915
{

0 commit comments

Comments
 (0)