summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-05 21:49:42 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-05 21:49:42 +0000
commite70210cad637c5be31709f65c0eb9603f8ec18a1 (patch)
tree47200e0b956e17248a8bbd4a2b6ac6cc96ee08cf
parentdd155e029e1bc42a15532f82f0d7e6bae5ec0229 (diff)
compile.c (rb_iseq_build_from_ary): remove misc handling
iseq->local_size is calculated, too, along with stack_size and param.size, meaning there is no need to blindly load values in the misc hash passed to us. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--compile.c11
2 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a65e8bafa2..07cb21d5a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec 6 06:48:03 2014 Eric Wong <e@80x24.org>
+
+ * compile.c (rb_iseq_build_from_ary): remove misc handling
+
Sat Dec 6 06:14:23 2014 Vit Ondruch <vondruch@redhat.com>
* configure.in (RUBY_LIB_VERSION): Fix --with-ruby-version
diff --git a/compile.c b/compile.c
index 217c5f5e28..f65c041529 100644
--- a/compile.c
+++ b/compile.c
@@ -6072,13 +6072,10 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
}
}
-#define MISC_PARAM(D,F) do { \
- if (!int_param(D, misc, SYM(F))) { \
- rb_raise(rb_eTypeError, "misc field missing: %s", #F); \
- } } while (0)
- MISC_PARAM(&iseq->local_size, local_size);
- /* iseq->stack_size and iseq->param.size are calculated */
-#undef MISC_PARAM
+ /*
+ * we currently ignore misc params,
+ * local_size, stack_size and param.size are all calculated
+ */
#define INT_PARAM(F) int_param(&iseq->param.F, params, SYM(F))
if (INT_PARAM(lead_num)) {