summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-24 11:59:44 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-24 11:59:44 +0000
commit714428154d5c64ae10a4d8d80f1cf1b05dc15f24 (patch)
treef96a9b97d3499a9fdf536b0ae96a214f7a060e24
parent6398f79853f73fd307f5ecd266a94644ecf625b9 (diff)
* compile.c (iseq_set_arguments): use RARRAY_RAWPTR() instead of
RARRAY_PTR() because there is no new reference. * compile.c (iseq_set_exception_table): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--compile.c8
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 962c2db126..a6ba0fce76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jul 24 20:57:44 2013 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c (iseq_set_arguments): use RARRAY_RAWPTR() instead of
+ RARRAY_PTR() because there is no new reference.
+
+ * compile.c (iseq_set_exception_table): ditto.
+
Wed Jul 24 19:49:54 2013 NARUSE, Yui <naruse@ruby-lang.org>
* lib/uri/generic.rb (find_proxy): raise BadURIError if the URI is
diff --git a/compile.c b/compile.c
index e62eb9cbbb..09841fc931 100644
--- a/compile.c
+++ b/compile.c
@@ -1169,7 +1169,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
iseq->arg_opts = i;
iseq->arg_opt_table = ALLOC_N(VALUE, i);
- MEMCPY(iseq->arg_opt_table, RARRAY_PTR(labels), VALUE, i);
+ MEMCPY(iseq->arg_opt_table, RARRAY_RAWPTR(labels), VALUE, i);
for (j = 0; j < i; j++) {
iseq->arg_opt_table[j] &= ~1;
}
@@ -1665,18 +1665,18 @@ label_get_sp(LABEL *lobj)
static int
iseq_set_exception_table(rb_iseq_t *iseq)
{
- VALUE *tptr, *ptr;
+ const VALUE *tptr, *ptr;
int tlen, i;
struct iseq_catch_table_entry *entry;
tlen = (int)RARRAY_LEN(iseq->compile_data->catch_table_ary);
- tptr = RARRAY_PTR(iseq->compile_data->catch_table_ary);
+ tptr = RARRAY_RAWPTR(iseq->compile_data->catch_table_ary);
iseq->catch_table = tlen ? ALLOC_N(struct iseq_catch_table_entry, tlen) : 0;
iseq->catch_table_size = tlen;
for (i = 0; i < tlen; i++) {
- ptr = RARRAY_PTR(tptr[i]);
+ ptr = RARRAY_RAWPTR(tptr[i]);
entry = &iseq->catch_table[i];
entry->type = (enum catch_type)(ptr[0] & 0xffff);
entry->start = label_get_position((LABEL *)(ptr[1] & ~1));