[pypy-commit] pypy py3k: fix -Ojit translation: kill stray/misplaced lines from a merge

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r68480:46e0449759bb
Date: 2013-12-18 17:53 -0800
http://bitbucket.org/pypy/pypy/changeset/46e0449759bb/

Log:	fix -Ojit translation: kill stray/misplaced lines from a merge

diff --git a/pypy/interpreter/pyframe.py b/pypy/interpreter/pyframe.py
--- a/pypy/interpreter/pyframe.py
+++ b/pypy/interpreter/pyframe.py
@@ -576,8 +576,6 @@
         """
         Initialize cellvars from self.locals_stack_w.
         """
-        if self.cells is None:
-            return
         args_to_copy = self.pycode._args_as_cellvars
         for i in range(len(args_to_copy)):
             argnum = args_to_copy[i]