1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent enabling yjit when zjit enabled (GH-13358)

Browse Source 
`ruby --yjit --zjit` already warns and exits, but it was still possible
to enable both with `ruby --zjit -e 'RubyVM:YJIT.enable`.

This commit prevents that with a warning and an early return. (We could
also exit, but that seems a bit unfriendly once we're already running
the program.)

Co-authored-by: ywenc <ywenc@github.com>
This commit is contained in:
Daniel Colson 2025-05-16 13:31:43 -04:00 committed by GitHub
parent cc90adb68d
commit eead83160b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
Notes: git 2025-05-16 17:31:57 +00:00 
Merged: https://github.com/ruby/ruby/pull/13358

Merged-By: XrXr
5 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common.mk
View File

@ -21737,6 +21737,7 @@ yjit.$(OBJEXT): {$(VPATH)}vm_sync.h
yjit.$(OBJEXT): {$(VPATH)}yjit.c yjit.$(OBJEXT): {$(VPATH)}yjit.c
yjit.$(OBJEXT): {$(VPATH)}yjit.h yjit.$(OBJEXT): {$(VPATH)}yjit.h
yjit.$(OBJEXT): {$(VPATH)}yjit.rbinc yjit.$(OBJEXT): {$(VPATH)}yjit.rbinc
yjit.$(OBJEXT): {$(VPATH)}zjit.h
zjit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h zjit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
zjit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h zjit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
zjit.$(OBJEXT): $(CCAN_DIR)/list/list.h zjit.$(OBJEXT): $(CCAN_DIR)/list/list.h

5
test/ruby/test_yjit.rb
View File

@ -166,6 +166,11 @@ class TestYJIT < Test::Unit::TestCase
end end
end end
if JITSupport.zjit_supported?
def test_yjit_enable_with_zjit_enabled
assert_in_out_err(['--zjit'], 'puts RubyVM::YJIT.enable', ['false'], ['Only one JIT can be enabled at the same time.'])
end
end
def test_yjit_stats_and_v_no_error def test_yjit_stats_and_v_no_error
_stdout, stderr, _status = invoke_ruby(%w(-v --yjit-stats), '', true, true) _stdout, stderr, _status = invoke_ruby(%w(-v --yjit-stats), '', true, true)

1
yjit.c
View File

@ -29,6 +29,7 @@
#include "iseq.h" #include "iseq.h"
#include "ruby/debug.h" #include "ruby/debug.h"
#include "internal/cont.h" #include "internal/cont.h"
#include "zjit.h"
// For mmapp(), sysconf() // For mmapp(), sysconf()
#ifndef _WIN32 #ifndef _WIN32

5
yjit.rb
View File

@ -48,6 +48,11 @@ module RubyVM::YJIT
def self.enable(stats: false, log: false, mem_size: nil, call_threshold: nil) def self.enable(stats: false, log: false, mem_size: nil, call_threshold: nil)
return false if enabled? return false if enabled?
if Primitive.cexpr! 'RBOOL(rb_zjit_enabled_p)'
warn("Only one JIT can be enabled at the same time.")
return false
end
if mem_size if mem_size
raise ArgumentError, "mem_size must be a Integer" unless mem_size.is_a?(Integer) raise ArgumentError, "mem_size must be a Integer" unless mem_size.is_a?(Integer)
raise ArgumentError, "mem_size must be between 1 and 2048 MB" unless (1..2048).include?(mem_size) raise ArgumentError, "mem_size must be between 1 and 2048 MB" unless (1..2048).include?(mem_size)

1
zjit.h
View File

@ -14,6 +14,7 @@ void rb_zjit_profile_enable(const rb_iseq_t *iseq);
void rb_zjit_bop_redefined(int redefined_flag, enum ruby_basic_operators bop); void rb_zjit_bop_redefined(int redefined_flag, enum ruby_basic_operators bop);
void rb_zjit_invalidate_ep_is_bp(const rb_iseq_t *iseq); void rb_zjit_invalidate_ep_is_bp(const rb_iseq_t *iseq);
#else #else
#define rb_zjit_enabled_p false
static inline void rb_zjit_compile_iseq(const rb_iseq_t *iseq, rb_execution_context_t *ec, bool jit_exception) {} static inline void rb_zjit_compile_iseq(const rb_iseq_t *iseq, rb_execution_context_t *ec, bool jit_exception) {}
static inline void rb_zjit_profile_insn(enum ruby_vminsn_type insn, rb_execution_context_t *ec) {} static inline void rb_zjit_profile_insn(enum ruby_vminsn_type insn, rb_execution_context_t *ec) {}
static inline void rb_zjit_profile_enable(const rb_iseq_t *iseq) {} static inline void rb_zjit_profile_enable(const rb_iseq_t *iseq) {}