summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-08 04:43:02 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-08 04:43:02 +0000
commit351db724b8ae09e64c50626b5bd584bc3abc576d (patch)
tree76d5780fee59259f0fc12ae0f2d2f075a31b871a
parent9c353d48ae2da3007f1c8df72e1c5b796dc77fda (diff)
downloadruby-351db724b8ae09e64c50626b5bd584bc3abc576d.tar.gz
ruby-351db724b8ae09e64c50626b5bd584bc3abc576d.tar.xz
ruby-351db724b8ae09e64c50626b5bd584bc3abc576d.zip
* compile.h: fix to skip inserting a trace insn.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--compile.h7
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 812e58e54..f11ec596e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 8 13:38:22 2008 Koichi Sasada <ko1@atdot.net>
+
+ * compile.h: fix to skip inserting a trace insn.
+
Tue Jul 8 11:41:17 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* dir.c: shoudn't use ruby object in globbing, because glob service
diff --git a/compile.h b/compile.h
index 92f573c8b..4bd4e99e2 100644
--- a/compile.h
+++ b/compile.h
@@ -164,11 +164,14 @@ PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2);
#define ADD_TRACE(seq, line, event) \
do { \
- if ((event) == RUBY_EVENT_LINE && iseq->coverage && RARRAY_PTR(iseq->coverage)[(line) - 1] == Qnil) { \
+ if ((event) == RUBY_EVENT_LINE && iseq->coverage && \
+ RARRAY_PTR(iseq->coverage)[(line) - 1] == Qnil) { \
RARRAY_PTR(iseq->coverage)[(line) - 1] = INT2FIX(0); \
ADD_INSN1(seq, line, trace, INT2FIX(RUBY_EVENT_COVERAGE)); \
} \
- ADD_INSN1(seq, line, trace, INT2FIX(event)); \
+ if (iseq->compile_data->option->trace_instruction) { \
+ ADD_INSN1(seq, line, trace, INT2FIX(event)); \
+ } \
}while(0);
/* add label */