ruby-changes:63435
From: Jeremy <ko1@a...>
Date: Mon, 26 Oct 2020 07:57:22 +0900 (JST)
Subject: [ruby-changes:63435] ff2276ef8c (master): Fix bootstrap-test error in previous commit
https://git.ruby-lang.org/ruby.git/commit/?id=ff2276ef8c From ff2276ef8cd6285d657cd15801bc5768e93f73d6 Mon Sep 17 00:00:00 2001 From: Jeremy Evans <code@j...> Date: Sun, 25 Oct 2020 15:56:10 -0700 Subject: Fix bootstrap-test error in previous commit diff --git a/variable.c b/variable.c index 8ac40ef..950eac0 100644 --- a/variable.c +++ b/variable.c @@ -2509,7 +2509,7 @@ rb_const_get_0(VALUE klass, ID id, int exclude, int recurse, int visibility) https://github.com/ruby/ruby/blob/trunk/variable.c#L2509 if (c != Qundef) { if (UNLIKELY(!rb_ractor_main_p())) { if (!rb_ractor_shareable_p(c)) { - rb_raise(rb_eNameError, "can not access non-sharable objects in constant %"PRIsVALUE"::%s by non-main Ractor.", rb_class_path(klass), rb_id2name(id)); + rb_raise(rb_eNameError, "can not access non-shareable objects in constant %"PRIsVALUE"::%s by non-main Ractor.", rb_class_path(klass), rb_id2name(id)); } } return c; diff --git a/vm_insnhelper.c b/vm_insnhelper.c index d22cf37..7d4109a 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1003,7 +1003,7 @@ vm_get_ev_const(rb_execution_context_t *ec, VALUE orig_klass, ID id, bool allow_ https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L1003 if (UNLIKELY(!rb_ractor_main_p())) { if (!rb_ractor_shareable_p(val)) { rb_raise(rb_eNameError, - "can not access non-sharable objects in constant %"PRIsVALUE"::%s by non-main ractor.", rb_class_path(klass), rb_id2name(id)); + "can not access non-shareable objects in constant %"PRIsVALUE"::%s by non-main ractor.", rb_class_path(klass), rb_id2name(id)); } } return val; -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/