aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--vm.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ae7c4ca70e..3a5af334d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 22 16:20:49 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * vm.c: Don't define vm_collect_usage_operand() and
+ static void vm_collect_usage_insn() when disabling
+ VM_COLLECT_USAGE_DETAILS. (refix r37796)
+
Thu Nov 22 15:26:02 2012 NARUSE, Yui <naruse@ruby-lang.org>
* vm_insnhelper.h: partly revert r37631 (DTrace support).
diff --git a/vm.c b/vm.c
index 673a74ed2c..62a16ecfad 100644
--- a/vm.c
+++ b/vm.c
@@ -67,10 +67,9 @@ rb_vm_control_frame_block_ptr(rb_control_frame_t *cfp)
#define VM_COLLECT_USAGE_DETAILS 0
#endif
+#if VM_COLLECT_USAGE_DETAILS
static void vm_collect_usage_operand(int insn, int n, VALUE op);
static void vm_collect_usage_insn(int insn);
-
-#if VM_COLLECT_USAGE_DETAILS
static void vm_collect_usage_register(int reg, int isset);
#endif
@@ -2492,6 +2491,7 @@ void (*ruby_vm_collect_usage_func_register)(int reg, int isset) = NULL;
#endif
+#if VM_COLLECT_USAGE_DETAILS
/* @param insn instruction number */
static void
vm_collect_usage_insn(int insn)
@@ -2522,7 +2522,6 @@ vm_collect_usage_operand(int insn, int n, VALUE op)
(*ruby_vm_collect_usage_func_operand)(insn, n, op);
}
-#if VM_COLLECT_USAGE_DETAILS
/* @param reg register id. see code of vm_analysis_register() */
/* @param iseset 0: read, 1: write */
static void