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

mjit.c: handle memory allocation failure

Browse source 
which was missing in r64033.

Prior to r64033, memory allocation failure had been checked by
TRY_WITH_GC and handled by rb_memerror. But calling rb_memerror on MJIT
worker is problematic since it does EC_JUMP_TAG in the end. Threads
except Ruby's main thread must not use it.

mjit_compile.c: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2018-07-24 15:40:05 +00:00
parent 461c79f17c
commit cd2eaf2a33
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mjit.c
View file

@ -334,7 +334,8 @@ form_args(int num, ...)
for (i = len = 0; i < num; i++) { for (i = len = 0; i < num; i++) {
args = va_arg(argp, char **); args = va_arg(argp, char **);
n = args_len(args); n = args_len(args);
res = (char **)realloc(res, sizeof(char *) * (len + n + 1)); if ((res = (char **)realloc(res, sizeof(char *) * (len + n + 1))) == NULL)
return NULL;
MEMCPY(res + len, args, char *, n + 1); MEMCPY(res + len, args, char *, n + 1);
len += n; len += n;
} }
@ -767,6 +768,8 @@ compile_c_to_so(const char *c_file, const char *so_file)
#ifdef _MSC_VER #ifdef _MSC_VER
solen = strlen(so_file); solen = strlen(so_file);
files[0] = p = (char *)malloc(sizeof(char) * (rb_strlen_lit("-Fe") + solen + 1)); files[0] = p = (char *)malloc(sizeof(char) * (rb_strlen_lit("-Fe") + solen + 1));
if (p == NULL)
return FALSE;
p = append_lit(p, "-Fe"); p = append_lit(p, "-Fe");
p = append_str2(p, so_file, solen); p = append_str2(p, so_file, solen);
*p = '\0'; *p = '\0';

2
mjit_compile.c
View file

@ -193,6 +193,8 @@ mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *func
status.success = TRUE; status.success = TRUE;
status.local_stack_p = !body->catch_except_p; status.local_stack_p = !body->catch_except_p;
status.stack_size_for_pos = (int *)malloc(sizeof(int) * body->iseq_size); status.stack_size_for_pos = (int *)malloc(sizeof(int) * body->iseq_size);
if (status.stack_size_for_pos == NULL)
return FALSE;
memset(status.stack_size_for_pos, NOT_COMPILED_STACK_SIZE, sizeof(int) * body->iseq_size); memset(status.stack_size_for_pos, NOT_COMPILED_STACK_SIZE, sizeof(int) * body->iseq_size);
/* For performance, we verify stack size only on compilation time (mjit_compile.inc.erb) without --jit-debug */ /* For performance, we verify stack size only on compilation time (mjit_compile.inc.erb) without --jit-debug */