[前][次][番号順一覧][スレッド一覧]

ruby-changes:73438

From: Takashi <ko1@a...>
Date: Tue, 6 Sep 2022 00:39:57 +0900 (JST)
Subject: [ruby-changes:73438] 63ed61e322 (master): Deal with MJIT_FORCE_ENABLE miniruby

https://git.ruby-lang.org/ruby.git/commit/?id=63ed61e322

From 63ed61e322178eebb425b7a9ad7f84dc52ef6c6f Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Mon, 5 Sep 2022 08:37:07 -0700
Subject: Deal with MJIT_FORCE_ENABLE miniruby

http://ci.rvm.jp/results/trunk-mjit@phosphorus-docker/4225469
---
 mjit.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mjit.c b/mjit.c
index 9687f759cf..4895e42d7d 100644
--- a/mjit.c
+++ b/mjit.c
@@ -1806,6 +1806,15 @@ mjit_init(const struct mjit_options *opts) https://github.com/ruby/ruby/blob/trunk/mjit.c#L1806
 {
     VM_ASSERT(mjit_enabled);
     mjit_opts = *opts;
+
+    // MJIT doesn't support miniruby, but it might reach here by MJIT_FORCE_ENABLE.
+    VALUE rb_mMJIT = rb_const_get(rb_cRubyVM, rb_intern("MJIT"));
+    if (!rb_const_defined(rb_mMJIT, rb_intern("Compiler"))) {
+        verbose(1, "Disabling MJIT because RubyVM::MJIT::Compiler is not defined");
+        mjit_enabled = false;
+        return;
+    }
+
     mjit_call_p = true;
     mjit_pid = getpid();
 
-- 
cgit v1.2.1


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

[前][次][番号順一覧][スレッド一覧]