1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

initialize VM postponed_job first. [Bug #15288]

Browse Source 
* inits.c: call `Init_vm_postponed_job` first because
  postponed_job is used by transient heap.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2018-11-08 05:35:46 +00:00
parent a74d08b957
commit 8634e62a62
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inits.c
View File

@ -19,6 +19,7 @@ rb_call_inits(void)
#if USE_TRANSIENT_HEAP #if USE_TRANSIENT_HEAP
CALL(TransientHeap); CALL(TransientHeap);
#endif #endif
CALL(vm_postponed_job);
CALL(Method); CALL(Method);
CALL(RandomSeedCore); CALL(RandomSeedCore);
CALL(sym); CALL(sym);

10
vm_trace.c
View File

@ -1470,8 +1470,6 @@ tracepoint_stat_s(VALUE self)
return stat; return stat;
} }
static void Init_postponed_job(void);
/* This function is called from inits.c */ /* This function is called from inits.c */
void void
Init_vm_trace(void) Init_vm_trace(void)
@ -1566,10 +1564,6 @@ Init_vm_trace(void)
rb_define_method(rb_cTracePoint, "raised_exception", tracepoint_attr_raised_exception, 0); rb_define_method(rb_cTracePoint, "raised_exception", tracepoint_attr_raised_exception, 0);
rb_define_singleton_method(rb_cTracePoint, "stat", tracepoint_stat_s, 0); rb_define_singleton_method(rb_cTracePoint, "stat", tracepoint_stat_s, 0);
/* initialized for postponed job */
Init_postponed_job();
} }
typedef struct rb_postponed_job_struct { typedef struct rb_postponed_job_struct {
@ -1580,8 +1574,8 @@ typedef struct rb_postponed_job_struct {
#define MAX_POSTPONED_JOB 1000 #define MAX_POSTPONED_JOB 1000
#define MAX_POSTPONED_JOB_SPECIAL_ADDITION 24 #define MAX_POSTPONED_JOB_SPECIAL_ADDITION 24
static void void
Init_postponed_job(void) Init_vm_postponed_job(void)
{ {
rb_vm_t *vm = GET_VM(); rb_vm_t *vm = GET_VM();
vm->postponed_job_buffer = ALLOC_N(rb_postponed_job_t, MAX_POSTPONED_JOB); vm->postponed_job_buffer = ALLOC_N(rb_postponed_job_t, MAX_POSTPONED_JOB);