From 2ef6e944896072687bdd28c846a62e5be37eec48 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 21 Jul 2021 12:54:18 +0900 Subject: codegen.c: move `gen_setxv()` after `new_sym()`. --- mrbgems/mruby-compiler/core/codegen.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c index 8af386b60..b173a83c5 100644 --- a/mrbgems/mruby-compiler/core/codegen.c +++ b/mrbgems/mruby-compiler/core/codegen.c @@ -529,20 +529,6 @@ gen_setupvar(codegen_scope *s, uint16_t dst, mrb_sym id) genop_3(s, OP_SETUPVAR, dst, idx, lv); } -static int new_sym(codegen_scope *s, mrb_sym sym); - -static void -gen_setxv(codegen_scope *s, uint8_t op, uint16_t dst, mrb_sym sym) -{ - int idx = new_sym(s, sym); - struct mrb_insn_data data = mrb_last_insn(s); - if (!no_peephole(s) && data.insn == OP_MOVE && data.a == dst) { - dst = data.b; - s->pc = s->lastpc; - } - genop_2(s, op, dst, idx); -} - static void gen_return(codegen_scope *s, uint8_t op, uint16_t src) { @@ -840,6 +826,18 @@ new_sym(codegen_scope *s, mrb_sym sym) return s->irep->slen++; } +static void +gen_setxv(codegen_scope *s, uint8_t op, uint16_t dst, mrb_sym sym) +{ + int idx = new_sym(s, sym); + struct mrb_insn_data data = mrb_last_insn(s); + if (!no_peephole(s) && data.insn == OP_MOVE && data.a == dst) { + dst = data.b; + s->pc = s->lastpc; + } + genop_2(s, op, dst, idx); +} + static void gen_int(codegen_scope *s, uint16_t dst, mrb_int i) { -- cgit v1.2.3