kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 7622819147: [Backport #18023]

Browse source 
Fix Ractor.make_shareable changing locals for Procs

	env_copy() uses rb_ary_delete_at() with a loop counting up while
	iterating through the list of read only locals. rb_ary_delete_at() can
	shift elements in the array to an index lesser than the loop index,
	causing locals to be missed and set to Qfalse in the returned
	environment.

	Iterate through the locals in reverse instead, this way the shifting
	never happens for locals that are yet to be visited and we process all
	the locals in the array.

	[Bug #18023]
	---
	 bootstraptest/test_ractor.rb | 22 ++++++++++++++++++++++
	 vm.c                         |  2 +-
	 2 files changed, 23 insertions(+), 1 deletion(-)
This commit is contained in:
nagachika 2021-10-16 13:28:27 +09:00
parent a2fe4b75e4
commit 5427b08381
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
bootstraptest/test_ractor.rb
View file

@ -187,6 +187,28 @@ assert_equal '[:ok, :ok, :ok]', %q{
}.map(&:take)
}
# Ractor.make_shareable issue for locals in proc [Bug #18023]
assert_equal '[:a, :b, :c, :d, :e]', %q{
v1, v2, v3, v4, v5 = :a, :b, :c, :d, :e
closure = Proc.new { [v1, v2, v3, v4, v5] }
Ractor.make_shareable(closure).call
}
# Ractor.make_shareable issue for locals in proc [Bug #18023]
assert_equal '[:a, :b, :c, :d, :e, :f, :g]', %q{
a = :a
closure = -> {
b, c, d = :b, :c, :d
-> {
e, f, g = :e, :f, :g
-> { [a, b, c, d, e, f, g] }
}.call
}.call
Ractor.make_shareable(closure).call
}
###
###
# Ractor still has several memory corruption so skip huge number of tests

2
version.h
View file

@ -12,7 +12,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 144
#define RUBY_PATCHLEVEL 145
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 10

2
vm.c
View file

@ -1005,7 +1005,7 @@ env_copy(const VALUE *src_ep, VALUE read_only_variables)
volatile VALUE prev_env = Qnil;
if (read_only_variables) {
for (int i=0; i<RARRAY_LENINT(read_only_variables); i++) {
for (int i=RARRAY_LENINT(read_only_variables)-1; i>=0; i--) {
ID id = SYM2ID(rb_str_intern(RARRAY_AREF(read_only_variables, i)));
for (unsigned int j=0; j<src_env->iseq->body->local_table_size; j++) {