зеркало из https://github.com/github/ruby.git
Unify SUPPORT_JOKE and OPT_SUPPORT_JOKE
for simplicity and consistency. Now SUPPORT_JOKE needs to be prefixed with OPT_ to make the config visible in `RubyVM::VmOptsH`, and the inconsistency was introduced. As it has never been available for override in configure (no #ifndef guard), it should be fine to rename the config.
This commit is contained in:
Родитель
7cb19b3f5b
Коммит
beaabd2308
|
@ -732,7 +732,7 @@ rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node)
|
||||||
ADD_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, leave);
|
ADD_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, leave);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if SUPPORT_JOKE
|
#if OPT_SUPPORT_JOKE
|
||||||
if (ISEQ_COMPILE_DATA(iseq)->labels_table) {
|
if (ISEQ_COMPILE_DATA(iseq)->labels_table) {
|
||||||
st_table *labels_table = ISEQ_COMPILE_DATA(iseq)->labels_table;
|
st_table *labels_table = ISEQ_COMPILE_DATA(iseq)->labels_table;
|
||||||
ISEQ_COMPILE_DATA(iseq)->labels_table = 0;
|
ISEQ_COMPILE_DATA(iseq)->labels_table = 0;
|
||||||
|
@ -6570,7 +6570,7 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
|
||||||
|
|
||||||
INIT_ANCHOR(recv);
|
INIT_ANCHOR(recv);
|
||||||
INIT_ANCHOR(args);
|
INIT_ANCHOR(args);
|
||||||
#if SUPPORT_JOKE
|
#if OPT_SUPPORT_JOKE
|
||||||
if (nd_type(node) == NODE_VCALL) {
|
if (nd_type(node) == NODE_VCALL) {
|
||||||
ID id_bitblt;
|
ID id_bitblt;
|
||||||
ID id_answer;
|
ID id_answer;
|
||||||
|
|
2
eval.c
2
eval.c
|
@ -478,7 +478,7 @@ static VALUE get_ec_errinfo(const rb_execution_context_t *ec);
|
||||||
static VALUE
|
static VALUE
|
||||||
exc_setup_cause(VALUE exc, VALUE cause)
|
exc_setup_cause(VALUE exc, VALUE cause)
|
||||||
{
|
{
|
||||||
#if SUPPORT_JOKE
|
#if OPT_SUPPORT_JOKE
|
||||||
if (NIL_P(cause)) {
|
if (NIL_P(cause)) {
|
||||||
ID id_true_cause;
|
ID id_true_cause;
|
||||||
CONST_ID(id_true_cause, "true_cause");
|
CONST_ID(id_true_cause, "true_cause");
|
||||||
|
|
2
iseq.h
2
iseq.h
|
@ -109,7 +109,7 @@ struct iseq_compile_data {
|
||||||
unsigned int ci_kw_index;
|
unsigned int ci_kw_index;
|
||||||
const rb_compile_option_t *option;
|
const rb_compile_option_t *option;
|
||||||
struct rb_id_table *ivar_cache_table;
|
struct rb_id_table *ivar_cache_table;
|
||||||
#if SUPPORT_JOKE
|
#if OPT_SUPPORT_JOKE
|
||||||
st_table *labels_table;
|
st_table *labels_table;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
|
@ -62,7 +62,6 @@
|
||||||
|
|
||||||
/* misc */
|
/* misc */
|
||||||
#define OPT_SUPPORT_JOKE 0
|
#define OPT_SUPPORT_JOKE 0
|
||||||
#define SUPPORT_JOKE OPT_SUPPORT_JOKE
|
|
||||||
|
|
||||||
#ifndef VM_COLLECT_USAGE_DETAILS
|
#ifndef VM_COLLECT_USAGE_DETAILS
|
||||||
#define VM_COLLECT_USAGE_DETAILS 0
|
#define VM_COLLECT_USAGE_DETAILS 0
|
||||||
|
|
Загрузка…
Ссылка в новой задаче