https://git.ruby-lang.org/ruby.git/commit/?id=58e7205c82

From 58e7205c82ad07b949302589e89aad388519c01d Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Fri, 8 Jul 2022 19:04:57 +0900
Subject: See the environment variable and then check if JIT options conflict

---
 ruby.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruby.c b/ruby.c
index 51921ffbe5..311e92a235 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1811,11 +1811,6 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt) https://github.com/ruby/ruby/blob/trunk/ruby.c#L1811
          */
         rb_warning("-K is specified; it is for 1.8 compatibility and may cause odd behavior");
 
-    if (MULTI_BITS_P(FEATURE_SET_BITS(opt->features) & feature_jit_mask)) {
-        rb_warn("MJIT and YJIT cannot both be enabled at the same time. Exiting");
-        return Qfalse;
-    }
-
     if (!(FEATURE_SET_BITS(opt->features) & feature_jit_mask)) {
 #if YJIT_BUILD
         if (!FEATURE_USED_P(opt->features, yjit) && getenv("RUBY_YJIT_ENABLE")) {
@@ -1823,6 +1818,11 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt) https://github.com/ruby/ruby/blob/trunk/ruby.c#L1818
         }
 #endif
     }
+    if (MULTI_BITS_P(FEATURE_SET_BITS(opt->features) & feature_jit_mask)) {
+        rb_warn("MJIT and YJIT cannot both be enabled at the same time. Exiting");
+        return Qfalse;
+    }
+
 #if USE_MJIT
     if (FEATURE_SET_P(opt->features, mjit)) {
         opt->mjit.on = TRUE; /* set mjit.on for ruby_show_version() API and check to call mjit_init() */
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/