 +#endif
 +
 +#define TRACE_INSN(insn) do { \
-+  VALUE trace_ary__; \
-+  TRACE_INSN_SET_EXTRA_INFO(insn, trace_ary__); \
-+  EXEC_EVENT_HOOK(th, RUBY_EVENT_INSN, GET_SELF(), \
-+    rb_intern(#insn), trace_ary__); \
++  EXEC_EVENT_HOOK(th, RUBY_EVENT_INSN, GET_SELF(), 0, 0); \
 +} while (0)
 +
  #ifdef  COLLECT_USAGE_ANALYSIS
  #define USAGE_ANALYSIS_INSN(insn)           vm_analysis_insn(insn)
  #define USAGE_ANALYSIS_OPERAND(insn, n, op) vm_analysis_operand(insn, n, (VALUE)op)
-@@ -28,12 +67,14 @@
+@@ -28,12 +62,14 @@
  #define USAGE_ANALYSIS_REGISTER(reg, s)		/* none */
  #endif
  

 #ifdef USE_INSN_RET_NUM
 static int
 insn_ret_num(VALUE insn)

===================================================================
--- vm_exec.h	(revision 25565)
+++ vm_exec.h	(working copy)
@@ -18,6 +18,40 @@
 typedef rb_num_t GENTRY;
 typedef rb_iseq_t *ISEQ;
 
+#include "insns_info.inc"
+
+#if 0
+
+#define TRACE_INSN_SET_EXTRA_INFO(insn, var) do { var = Qnil; } while (0)
+
