ko1	2015-10-24 04:13:51 +0900 (Sat, 24 Oct 2015)

  New Revision: 52258

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52258

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/iseq.c
    trunk/vm_opts.h
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 52257)
+++ ChangeLog	(revision 52258)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Oct 24 04:10:13 2015  Koichi Sasada  <ko1@a...>
+
+	* 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  <ko1@a...>
 
 	* ruby.c: introduce --enable-frozen-string-literal-debug option.
Index: iseq.c
===================================================================
--- iseq.c	(revision 52257)
+++ iseq.c	(revision 52258)
@@ -340,7 +340,8 @@ static rb_compile_option_t COMPILE_OPTIO https://github.com/ruby/ruby/blob/trunk/iseq.c#L340
     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_opt https://github.com/ruby/ruby/blob/trunk/iseq.c#L420
 	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
Index: vm_opts.h
===================================================================
--- vm_opts.h	(revision 52257)
+++ vm_opts.h	(revision 52258)
@@ -18,12 +18,13 @@ https://github.com/ruby/ruby/blob/trunk/vm_opts.h#L18
  * 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.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/