Generate block_pass/iter after assinging temp variables to avoid variable overlap

adambeynon · adambeynon · commit 52cdb5e6c1b9 · 2013-11-03T10:12:28.000Z
diff --git a/lib/opal/nodes/call.rb b/lib/opal/nodes/call.rb
@@ -29,14 +29,17 @@ def compile
         splat = arglist[1..-1].any? { |a| a.first == :splat }
 
         if Sexp === arglist.last and arglist.last.type == :block_pass
-          block = expr(arglist.pop)
+          block = arglist.pop
         elsif iter
-          block = expr(iter)
+          block = iter
         end
 
         tmpfunc = scope.new_temp if block
         tmprecv = scope.new_temp if splat || tmpfunc
 
+        # must do this after assigning temp variables
+        block = expr(block) if block
+
         recv_code = recv(recv_sexp)
         call_recv = s(:js_tmp, tmprecv || recv_code)
 
