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

Don't put MicroJIT status in RUBY_DESCRIPTION

Browse Source 
That messes with tests too much.
This commit is contained in:
Alan Wu 2020-10-05 12:52:43 -04:00
parent 2790428e55
commit df15dfa6fd
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
version.c
View File

@ -42,9 +42,7 @@ const char ruby_release_date[] = RUBY_RELEASE_DATE;
const char ruby_platform[] = RUBY_PLATFORM; const char ruby_platform[] = RUBY_PLATFORM;
const int ruby_patchlevel = RUBY_PATCHLEVEL; const int ruby_patchlevel = RUBY_PATCHLEVEL;
const char ruby_description[] = RUBY_DESCRIPTION_WITH(""); const char ruby_description[] = RUBY_DESCRIPTION_WITH("");
const char ruby_description_with_ujit[] = RUBY_DESCRIPTION_WITH(" +UJIT");
static const char ruby_description_with_jit[] = RUBY_DESCRIPTION_WITH(" +JIT"); static const char ruby_description_with_jit[] = RUBY_DESCRIPTION_WITH(" +JIT");
static const char ruby_description_with_both_jits[] = RUBY_DESCRIPTION_WITH(" +JIT +UJIT");
const char ruby_copyright[] = RUBY_COPYRIGHT; const char ruby_copyright[] = RUBY_COPYRIGHT;
const char ruby_engine[] = "ruby"; const char ruby_engine[] = "ruby";
@ -105,20 +103,10 @@ Init_ruby_description(void)
VALUE description; VALUE description;
if (MJIT_OPTS_ON) { if (MJIT_OPTS_ON) {
if (rb_ujit_enabled_p()) { description = MKSTR(description_with_jit);
description = MKSTR(description_with_both_jits);
}
else {
description = MKSTR(description_with_jit);
}
} }
else { else {
if (rb_ujit_enabled_p()) { description = MKSTR(description);
description = MKSTR(description_with_ujit);
}
else {
description = MKSTR(description);
}
} }
/* /*
@ -131,20 +119,14 @@ void
ruby_show_version(void) ruby_show_version(void)
{ {
if (MJIT_OPTS_ON) { if (MJIT_OPTS_ON) {
if (rb_ujit_enabled_p()) { PRINT(description_with_jit);
PRINT(description_with_both_jits);
}
else {
PRINT(description_with_jit);
}
} }
else { else {
if (rb_ujit_enabled_p()) { PRINT(description);
PRINT(description_with_ujit); }
}
else { if (rb_ujit_enabled_p()) {
PRINT(description); fputs("MicroJIT is on\n", stdout);
}
} }
#ifdef RUBY_LAST_COMMIT_TITLE #ifdef RUBY_LAST_COMMIT_TITLE
fputs("last_commit=" RUBY_LAST_COMMIT_TITLE, stdout); fputs("last_commit=" RUBY_LAST_COMMIT_TITLE, stdout);