2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cd3607835d..f8c7b227e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 26 19:43:42 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (make_compile_option_value): add trace_instruction option.
+	  a patch by davidbalbert (David Albert).
+	  [Bug #6786]
+
 Mon Nov 26 19:10:53 2012  Koichi Sasada  <ko1@atdot.net>
 
 	* bootstraptest/test_thread.rb: try to `join' each 100
diff --git a/iseq.c b/iseq.c
index aef63eb1df..06cf4f122b 100644
--- a/iseq.c
+++ b/iseq.c
@@ -382,6 +382,7 @@ make_compile_option_value(rb_compile_option_t *option)
 	SET_COMPILE_OPTION(option, opt, operands_unification);
 	SET_COMPILE_OPTION(option, opt, instructions_unification);
 	SET_COMPILE_OPTION(option, opt, stack_caching);
+	SET_COMPILE_OPTION(option, opt, trace_instruction);
 	SET_COMPILE_OPTION_NUM(option, opt, debug_level);
     }
 #undef SET_COMPILE_OPTION