aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-16 07:59:09 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-16 07:59:09 +0000
commitfde77a7b6714425606ac9f4ac3e32f1c9ad54da7 (patch)
tree528d5c3dfdcce30f36545adaef2aaa82c7162327
parentc8acf9e2913fd7b428d44a1a89fae2956d99638d (diff)
downloadruby-fde77a7b6714425606ac9f4ac3e32f1c9ad54da7.tar.gz
Revert "Fix error: implicit conversion loses integer precision"
This reverts commit r62708. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--compile.c2
-rw-r--r--iseq.h4
-rw-r--r--vm_core.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/compile.c b/compile.c
index 18abaca22b..4cd1863e1b 100644
--- a/compile.c
+++ b/compile.c
@@ -8760,7 +8760,7 @@ ibf_load_iseq_each(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t of
ISEQ_COVERAGE_SET(iseq, Qnil);
ISEQ_ORIGINAL_ISEQ_CLEAR(iseq);
- iseq->body->variable.flip_count = body->variable.flip_count;
+ iseq->body->variable.flip_count = (int)body->variable.flip_count;
{
VALUE realpath = Qnil, path = ibf_load_object(load, body->location.pathobj);
diff --git a/iseq.h b/iseq.h
index 0a0edd9b7a..a39d827670 100644
--- a/iseq.h
+++ b/iseq.h
@@ -35,10 +35,10 @@ rb_call_info_kw_arg_bytes(int keyword_len)
#define ISEQ_FLIP_CNT(iseq) (iseq)->body->variable.flip_count
-static inline rb_snum_t
+static inline int
ISEQ_FLIP_CNT_INCREMENT(const rb_iseq_t *iseq)
{
- rb_snum_t cnt = iseq->body->variable.flip_count;
+ int cnt = iseq->body->variable.flip_count;
iseq->body->variable.flip_count += 1;
return cnt;
}
diff --git a/vm_core.h b/vm_core.h
index 9b8aede35c..24ecc9be54 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -412,7 +412,7 @@ struct rb_iseq_constant_body {
struct rb_call_cache *cc_entries; /* size is ci_size = ci_kw_size */
struct {
- rb_snum_t flip_count;
+ rb_num_t flip_count;
VALUE coverage;
VALUE original_iseq;
} variable;