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) 1fac99afda: [Backport #18030]

Browse source 
skip marking for uninitialized imemo_env.

	RUBY_INTERNAL_EVENT_NEWOBJ can expose uninitialized imemo_env
	objects and marking it will cause critical error. This patch
	skips marking on uninitialized imemo_env.

	See: http://rubyci.s3.amazonaws.com/centos7/ruby-master/log/20210329T183003Z.fail.html.gz

	Shortest repro-code is provided by mame-san.
	---
	 gc.c                           | 16 ++++++++++------
	 test/objspace/test_objspace.rb | 13 +++++++++++++
	 2 files changed, 23 insertions(+), 6 deletions(-)
This commit is contained in:
nagachika 2021-07-18 10:58:55 +09:00
parent 3540939b95
commit ca6ebde821
3 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gc.c
View file

@ -6187,12 +6187,16 @@ gc_mark_imemo(rb_objspace_t *objspace, VALUE obj)
case imemo_env: case imemo_env:
{ {
const rb_env_t *env = (const rb_env_t *)obj; const rb_env_t *env = (const rb_env_t *)obj;
GC_ASSERT(env->ep[VM_ENV_DATA_INDEX_ENV] == obj);
GC_ASSERT(VM_ENV_ESCAPED_P(env->ep)); if (LIKELY(env->ep)) {
gc_mark_values(objspace, (long)env->env_size, env->env); // just after newobj() can be NULL here.
VM_ENV_FLAGS_SET(env->ep, VM_ENV_FLAG_WB_REQUIRED); GC_ASSERT(env->ep[VM_ENV_DATA_INDEX_ENV] == obj);
gc_mark(objspace, (VALUE)rb_vm_env_prev_env(env)); GC_ASSERT(VM_ENV_ESCAPED_P(env->ep));
gc_mark(objspace, (VALUE)env->iseq); gc_mark_values(objspace, (long)env->env_size, env->env);
VM_ENV_FLAGS_SET(env->ep, VM_ENV_FLAG_WB_REQUIRED);
gc_mark(objspace, (VALUE)rb_vm_env_prev_env(env));
gc_mark(objspace, (VALUE)env->iseq);
}
} }
return; return;
case imemo_cref: case imemo_cref:

13
test/objspace/test_objspace.rb
View file

@ -243,6 +243,19 @@ class TestObjSpace < Test::Unit::TestCase
GC.enable GC.enable
end end
def test_trace_object_allocations_gc_stress
prev = GC.stress
GC.stress = true
ObjectSpace.trace_object_allocations{
proc{}
}
assert true # success
ensure
GC.stress = prev
end
def test_dump_flags def test_dump_flags
info = ObjectSpace.dump("foo".freeze) info = ObjectSpace.dump("foo".freeze)
assert_match(/"wb_protected":true, "old":true/, info) assert_match(/"wb_protected":true, "old":true/, info)

4
version.h
View file

@ -12,11 +12,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3 #define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 108 #define RUBY_PATCHLEVEL 109
#define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 7 #define RUBY_RELEASE_DAY 18
#include "ruby/version.h" #include "ruby/version.h"