summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-compiler
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-08-16 16:36:13 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2019-08-16 16:42:40 +0900
commit06c7ff06662440a900c06cda5646b7090ab9d8c9 (patch)
tree8ebaeb4292095a8a5df9def16fd021e3e07e45c2 /mrbgems/mruby-compiler
parentfa8515bc2c22ad1b1c7688cf0201022702f6a22f (diff)
downloadmruby-06c7ff06662440a900c06cda5646b7090ab9d8c9.tar.gz
mruby-06c7ff06662440a900c06cda5646b7090ab9d8c9.zip
Avoid creating unnecessary empty arrays on splat.
But this changes requires `OP_ARYCAT` and `OP_ARYPUSH` to accept `nil` as their first operand. Alternative VMs (e.g. `mruby/c`) that understand mruby bytecode need to be updated.
Diffstat (limited to 'mrbgems/mruby-compiler')
-rw-r--r--mrbgems/mruby-compiler/core/codegen.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c
index 5cade970c..d4031f6fd 100644
--- a/mrbgems/mruby-compiler/core/codegen.c
+++ b/mrbgems/mruby-compiler/core/codegen.c
@@ -956,7 +956,12 @@ gen_values(codegen_scope *s, node *t, int val, int extra)
}
else {
pop_n(n);
- genop_2(s, OP_ARRAY, cursp(), n);
+ if (n == 0 && is_splat) {
+ genop_1(s, OP_LOADNIL, cursp());
+ }
+ else {
+ genop_2(s, OP_ARRAY, cursp(), n);
+ }
push();
codegen(s, t->car, VAL);
pop(); pop();