Protect %eax and fix up stack for splat calls

vidarh · Aug 17, 2013 · 8802ce5 · 8802ce5
1 parent bcb7668
commit 8802ce5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/compiler.rb b/compiler.rb
@@ -510,9 +510,14 @@ def compile_callm_args(scope, ob, args)
     end
 
     if splat
+      @e.pushl(:eax)
       reg = compile_eval_arg(scope,:numargs)
+      @e.subl(args.size,reg)
       @e.sall(2,reg)
-      @e.addl(reg,:esp)
+      # We assume :ebx has been trashed at this point anyway
+      @e.movl(reg,:ebx)
+      @e.popl(:eax)
+      @e.addl(:ebx,:esp)
     end
   end
 

diff --git a/features/inputs/splatreturn.rb b/features/inputs/splatreturn.rb
@@ -0,0 +1,11 @@
+
+def foo(a)
+  "Hey!"
+end
+
+def splat *args
+  foo(*args)
+end
+
+puts(splat(1))
+