diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2022-01-02 18:01:53 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-01-02 18:01:53 +0900 |
| commit | ab4baba283a15c7b44812f60afbd35fe17d9807c (patch) | |
| tree | e4b37567c95fffe776f8cc15aef436b79d55027b /src | |
| parent | 28ccc664e5dcd3f9d55173e9afde77c4705a9ab6 (diff) | |
| parent | d3b7601af96c9e0eeba4c89359289661c755a74a (diff) | |
| download | mruby-ab4baba283a15c7b44812f60afbd35fe17d9807c.tar.gz mruby-ab4baba283a15c7b44812f60afbd35fe17d9807c.zip | |
Merge pull request #5620 from dearblue/adjust-stacks
Adjusting the stack for after it enters the virtual machine
Diffstat (limited to 'src')
| -rw-r--r-- | src/class.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/class.c b/src/class.c index ec9c648e5..f97cc4c40 100644 --- a/src/class.c +++ b/src/class.c @@ -929,6 +929,13 @@ mrb_block_given_p(mrb_state *mrb) MRB_API mrb_int mrb_get_args(mrb_state *mrb, const char *format, ...) { +#define ADJUST_STACK() do { \ + if (argv_on_stack) { \ + ci = mrb->c->ci; \ + argv = mrb->c->ci->stack + 1; \ + } \ +} while (0) + const char *fmt = format; char c; int i = 0; @@ -1191,6 +1198,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) p = va_arg(ap, mrb_float*); if (pickarg) { *p = mrb_as_float(mrb, *pickarg); + ADJUST_STACK(); } } break; @@ -1202,6 +1210,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) p = va_arg(ap, mrb_int*); if (pickarg) { *p = mrb_as_int(mrb, *pickarg); + ADJUST_STACK(); } } break; @@ -1364,6 +1373,8 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) finish: va_end(ap); return i; + +#undef ADJUST_STACK } static struct RClass* |