[pypy-commit] pypy default: Redo the GeneratorIterator/WithDel optimization, which should work now

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r68825:db6d61fc43ed
Date: 2014-01-21 16:41 +0100
http://bitbucket.org/pypy/pypy/changeset/db6d61fc43ed/

Log:	Redo the GeneratorIterator/WithDel optimization, which should work
	now that the JIT bug was fixed.

diff --git a/pypy/interpreter/pyframe.py b/pypy/interpreter/pyframe.py
--- a/pypy/interpreter/pyframe.py
+++ b/pypy/interpreter/pyframe.py
@@ -167,7 +167,7 @@
     def run(self):
         """Start this frame's execution."""
         if self.getcode().co_flags & pycode.CO_GENERATOR:
-            if 1:# self.getcode().co_flags & pycode.CO_YIELD_INSIDE_TRY:
+            if self.getcode().co_flags & pycode.CO_YIELD_INSIDE_TRY:
                 from pypy.interpreter.generator import GeneratorIteratorWithDel
                 return self.space.wrap(GeneratorIteratorWithDel(self))
             else: