[pypy-commit] pypy jit-settrace: copy fixes from default

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: jit-settrace
Changeset: r67583:3c7fb1b6977b
Date: 2013-10-24 11:13 -0700
http://bitbucket.org/pypy/pypy/changeset/3c7fb1b6977b/

Log:	copy fixes from default

diff --git a/pypy/interpreter/nestedscope.py b/pypy/interpreter/nestedscope.py
--- a/pypy/interpreter/nestedscope.py
+++ b/pypy/interpreter/nestedscope.py
@@ -125,8 +125,7 @@
         if len(cellvars) != ncellvars:
             raise OperationError(self.space.w_TypeError,
                                  self.space.wrap("bad cellvars"))
-        if self.cells is not None:
-            self.cells[:ncellvars] = cellvars
+        self.cells[:ncellvars] = cellvars
 
     @jit.look_inside_iff(lambda self: jit.isvirtual(self))
     def fast2locals(self):
@@ -165,8 +164,6 @@
 
     @jit.unroll_safe
     def init_cells(self):
-        if not self.cells:
-            return
         args_to_copy = self.pycode._args_as_cellvars
         for i in range(len(args_to_copy)):
             argnum = args_to_copy[i]