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

Use setup_yjit_options only when supported

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2022-01-11 17:26:21 +09:00
parent 1c9b5d452e
commit 3d675c72b9
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ruby.c
View File

@ -1084,20 +1084,15 @@ set_option_encoding_once(const char *type, VALUE *name, const char *e, long elen
#define yjit_opt_match_arg(s, l, name) \ #define yjit_opt_match_arg(s, l, name) \
opt_match(s, l, name) && (*(s) && *(s+1) ? 1 : (rb_raise(rb_eRuntimeError, "--yjit-" name " needs an argument"), 0)) opt_match(s, l, name) && (*(s) && *(s+1) ? 1 : (rb_raise(rb_eRuntimeError, "--yjit-" name " needs an argument"), 0))
static bool #if YJIT_SUPPORTED_P
static void
setup_yjit_options(const char *s, struct rb_yjit_options *yjit_opt) setup_yjit_options(const char *s, struct rb_yjit_options *yjit_opt)
{ {
const char prefix[] = "yjit-";
if (strncmp(prefix, s, sizeof(prefix)-1) != 0) {
return false;
}
s += sizeof(prefix)-1;
const size_t l = strlen(s); const size_t l = strlen(s);
if (l == 0) { if (l == 0) {
return false; return;
} }
else if (yjit_opt_match_arg(s, l, "exec-mem-size")) {
if (yjit_opt_match_arg(s, l, "exec-mem-size")) {
yjit_opt->exec_mem_size = atoi(s + 1); yjit_opt->exec_mem_size = atoi(s + 1);
} }
else if (yjit_opt_match_arg(s, l, "call-threshold")) { else if (yjit_opt_match_arg(s, l, "call-threshold")) {
@ -1119,16 +1114,17 @@ setup_yjit_options(const char *s, struct rb_yjit_options *yjit_opt)
rb_raise(rb_eRuntimeError, rb_raise(rb_eRuntimeError,
"invalid yjit option `%s' (--help will show valid yjit options)", s); "invalid yjit option `%s' (--help will show valid yjit options)", s);
} }
return true;
} }
#endif
#if USE_MJIT #if USE_MJIT
static void static void
setup_mjit_options(const char *s, struct mjit_options *mjit_opt) setup_mjit_options(const char *s, struct mjit_options *mjit_opt)
{ {
if (*s != '-') return; const size_t l = strlen(s);
const size_t l = strlen(++s); if (l == 0) {
if (*s == 0) return; return;
}
else if (opt_match_noarg(s, l, "warnings")) { else if (opt_match_noarg(s, l, "warnings")) {
mjit_opt->warnings = 1; mjit_opt->warnings = 1;
} }
@ -1537,17 +1533,18 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
FEATURE_SET(opt->features, FEATURE_BIT(yjit)); FEATURE_SET(opt->features, FEATURE_BIT(yjit));
#endif #endif
} }
else if (strncmp("mjit", s, 4) == 0) { else if (is_option_with_optarg("mjit", '-', true, false, false)) {
#if USE_MJIT #if USE_MJIT
FEATURE_SET(opt->features, FEATURE_BIT(mjit)); FEATURE_SET(opt->features, FEATURE_BIT(mjit));
setup_mjit_options(s + 4, &opt->mjit); setup_mjit_options(s, &opt->mjit);
#else #else
rb_warn("MJIT support is disabled."); rb_warn("MJIT support is disabled.");
#endif #endif
} }
else if (strcmp("yjit", s) == 0 || setup_yjit_options(s, &opt->yjit)) { else if (is_option_with_optarg("yjit", '-', true, false, false)) {
#if USE_MJIT #if USE_MJIT
FEATURE_SET(opt->features, FEATURE_BIT(yjit)); FEATURE_SET(opt->features, FEATURE_BIT(yjit));
setup_yjit_options(s, &opt->yjit);
#else #else
rb_warn("Ruby was built without JIT support"); rb_warn("Ruby was built without JIT support");
#endif #endif