diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | vm_insnhelper.c | 10 |
2 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,7 @@ +Thu Jan 13 20:49:19 2011 Tanaka Akira <akr@fsij.org> + + * vm_insnhelper.c: parenthesize macro arguments. + Thu Jan 13 13:21:00 2011 Kenta Murata <mrkn@mrkn.jp> * vm_dump.c: delete dashes to make lines 80 chars, Patched by diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 46449df7b1..d537661204 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -132,15 +132,15 @@ argument_error(const rb_iseq_t *iseq, int miss_argc, int correct_argc) } #define VM_CALLEE_SETUP_ARG(ret, th, iseq, orig_argc, orig_argv, block) \ - if (LIKELY(iseq->arg_simple & 0x01)) { \ + if (LIKELY((iseq)->arg_simple & 0x01)) { \ /* simple check */ \ - if (orig_argc != iseq->argc) { \ - argument_error(iseq, orig_argc, iseq->argc); \ + if ((orig_argc) != (iseq)->argc) { \ + argument_error((iseq), (orig_argc), (iseq)->argc); \ } \ - ret = 0; \ + (ret) = 0; \ } \ else { \ - ret = vm_callee_setup_arg_complex(th, iseq, orig_argc, orig_argv, block); \ + (ret) = vm_callee_setup_arg_complex((th), (iseq), (orig_argc), (orig_argv), (block)); \ } static inline int |