summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-01 23:03:35 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-01 23:03:35 +0000
commit57da36ebcfafa68b988a2b5b23e645f2aecc724c (patch)
treefd97d109392fdbb19f4af973ae2c0f08efee0312
parent11f3526734732ea90396cd08b9b04e7d3a107588 (diff)
iseq.c (rb_iseq_line_trace_each): explicit cast
Fix https://travis-ci.org/ruby/ruby/jobs/36814282 Tested with -Wconversion since my gcc lacks -Wshorten-64-to-32 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47760 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--iseq.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fb9a06f9cbf..b59a09eb771 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 2 07:56:49 2014 Eric Wong <e@80x24.org>
+
+ * iseq.c (rb_iseq_line_trace_each): explicit cast
+ Fix https://travis-ci.org/ruby/ruby/jobs/36814282
+
Thu Oct 2 05:40:05 2014 Eric Wong <e@80x24.org>
* ruby.h: set rb_event_flag_t to uint32_t
diff --git a/iseq.c b/iseq.c
index 6b89ea5daa5..2872d4f131c 100644
--- a/iseq.c
+++ b/iseq.c
@@ -2154,7 +2154,9 @@ rb_iseq_line_trace_each(VALUE iseqval, int (*func)(int line, rb_event_flag_t *ev
insn = iseq_original[pos];
if (insn == BIN(trace)) {
- rb_event_flag_t current_events = (VALUE)iseq_original[pos+1];
+ rb_event_flag_t current_events;
+
+ current_events = (rb_event_flag_t)iseq_original[pos+1];
if (current_events & RUBY_EVENT_LINE) {
rb_event_flag_t events = current_events & RUBY_EVENT_SPECIFIED_LINE;