summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYusuke Endoh <mame@ruby-lang.org>2019-12-09 12:04:58 +0900
committerYusuke Endoh <mame@ruby-lang.org>2019-12-09 12:04:58 +0900
commit036bc1da6c6c9b0fa9b7f5968d897a9554dd770e (patch)
treeeb321ed8828e90c830ad63af826400b9bd87c6e0
parent0e71fbc18e97007ac9a9b242b800f34057f5f287 (diff)
vm_args.c (rb_warn_check): Use iseq_unique_id instead of its pointer
If iseq is GC'ed, the pointer of iseq may be reused, which may hide a deprecation warning of keyword argument change. http://ci.rvm.jp/results/trunk-test1@phosphorus-docker/2474221 ``` 1) Failure: TestKeywordArguments#test_explicit_super_kwsplat [/tmp/ruby/v2/src/trunk-test1/test/ruby/test_keyword.rb:549]: --- expected +++ actual @@ -1 +1 @@ -/The keyword argument is passed as the last hash parameter.* for `m'/m +"" ``` This change ad-hocly adds iseq_unique_id for each iseq, and use it instead of iseq pointer. This covers the case where caller is GC'ed. Still, the case where callee is GC'ed, is not covered. But anyway, it is very rare that iseq is GC'ed. Even when it occurs, it just hides some warnings. It's no big deal.
-rw-r--r--iseq.c3
-rw-r--r--vm_args.c6
-rw-r--r--vm_core.h2
3 files changed, 10 insertions, 1 deletions
diff --git a/iseq.c b/iseq.c
index 7fbb906525f..b3c7ad53d33 100644
--- a/iseq.c
+++ b/iseq.c
@@ -427,11 +427,14 @@ rb_iseq_memsize(const rb_iseq_t *iseq)
return size;
}
+static unsigned long fresh_iseq_unique_id = 0; /* -- Remove In 3.0 -- */
+
static rb_iseq_t *
iseq_alloc(void)
{
rb_iseq_t *iseq = iseq_imemo_alloc();
iseq->body = ZALLOC(struct rb_iseq_constant_body);
+ iseq->body->iseq_unique_id = fresh_iseq_unique_id++; /* -- Remove In 3.0 -- */
return iseq;
}
diff --git a/vm_args.c b/vm_args.c
index 97b1d4ac60e..41824527de3 100644
--- a/vm_args.c
+++ b/vm_args.c
@@ -593,8 +593,12 @@ VALUE rb_iseq_location(const rb_iseq_t *iseq);
*/
static st_table *caller_to_callees = 0;
-static VALUE rb_warn_check(const rb_execution_context_t * const ec, const void *const callee)
+static VALUE rb_warn_check(const rb_execution_context_t * const ec, const rb_iseq_t *const iseq)
{
+ if (!iseq) return 0;
+
+ const void *const callee = (void *)iseq->body->iseq_unique_id;
+
const rb_control_frame_t * const cfp = rb_vm_get_ruby_level_next_cfp(ec, ec->cfp);
if (!cfp) return 0;
diff --git a/vm_core.h b/vm_core.h
index f7ec156cc58..4b1b9e43d02 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -447,6 +447,8 @@ struct rb_iseq_constant_body {
long unsigned total_calls; /* number of total calls with `mjit_exec()` */
struct rb_mjit_unit *jit_unit;
#endif
+
+ unsigned long iseq_unique_id; /* -- Remove In 3.0 -- */
};
/* T_IMEMO/iseq */