From 1e158208fc3223e39809549a7654aa9c37491e8f Mon Sep 17 00:00:00 2001 From: ko1 Date: Fri, 23 Oct 2015 19:13:51 +0000 Subject: * iseq.c (make_compile_option_value): include frozen_string_literal* in a made option value. * vm_opts.h: forgot to add OPT_FROZEN_STRING_LITERAL_DEBUG at last commit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52258 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ iseq.c | 5 ++++- vm_opts.h | 13 +++++++------ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8844c5342b..b160bf6628 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sat Oct 24 04:10:13 2015 Koichi Sasada + + * iseq.c (make_compile_option_value): include frozen_string_literal* + in a made option value. + + * vm_opts.h: forgot to add OPT_FROZEN_STRING_LITERAL_DEBUG + at last commit. + Sat Oct 24 03:58:02 2015 Koichi Sasada * ruby.c: introduce --enable-frozen-string-literal-debug option. diff --git a/iseq.c b/iseq.c index 587b49c4ad..6b243feb7e 100644 --- a/iseq.c +++ b/iseq.c @@ -340,7 +340,8 @@ static rb_compile_option_t COMPILE_OPTION_DEFAULT = { OPT_INSTRUCTIONS_UNIFICATION, /* int instructions_unification; */ OPT_STACK_CACHING, /* int stack_caching; */ OPT_TRACE_INSTRUCTION, /* int trace_instruction */ - OPT_FROZEN_STRING_LITERAL + OPT_FROZEN_STRING_LITERAL, + OPT_FROZEN_STRING_LITERAL_DEBUG }; static const rb_compile_option_t COMPILE_OPTION_FALSE = {0}; @@ -419,6 +420,8 @@ make_compile_option_value(rb_compile_option_t *option) SET_COMPILE_OPTION(option, opt, instructions_unification); SET_COMPILE_OPTION(option, opt, stack_caching); SET_COMPILE_OPTION(option, opt, trace_instruction); + SET_COMPILE_OPTION(option, opt, frozen_string_literal); + SET_COMPILE_OPTION(option, opt, frozen_string_literal_debug); SET_COMPILE_OPTION_NUM(option, opt, debug_level); } #undef SET_COMPILE_OPTION diff --git a/vm_opts.h b/vm_opts.h index ad81208e80..8fd2749749 100644 --- a/vm_opts.h +++ b/vm_opts.h @@ -18,12 +18,13 @@ * Following definitions are default values. */ -#define OPT_TRACE_INSTRUCTION 1 -#define OPT_TAILCALL_OPTIMIZATION 0 -#define OPT_PEEPHOLE_OPTIMIZATION 1 -#define OPT_SPECIALISED_INSTRUCTION 1 -#define OPT_INLINE_CONST_CACHE 1 -#define OPT_FROZEN_STRING_LITERAL 0 +#define OPT_TRACE_INSTRUCTION 1 +#define OPT_TAILCALL_OPTIMIZATION 0 +#define OPT_PEEPHOLE_OPTIMIZATION 1 +#define OPT_SPECIALISED_INSTRUCTION 1 +#define OPT_INLINE_CONST_CACHE 1 +#define OPT_FROZEN_STRING_LITERAL 0 +#define OPT_FROZEN_STRING_LITERAL_DEBUG 0 /* Build Options. * You can't change these options at runtime. -- cgit v1.2.3