pypy/interpreter/executioncontext.py

@@ -23,8 +23,6 @@ class ExecutionContext(object):
     # XXX [fijal] but they're not. is_being_profiled is guarded a bit all
     #     over the place as well as w_tracefunc
 
-    _immutable_fields_ = ['profilefunc?', 'w_tracefunc?']
-
     def __init__(self, space):
         self.space = space
         self.topframeref = jit.vref_None

pypy/interpreter/pyopcode.py

@@ -177,6 +177,7 @@ class __extend__(pyframe.PyFrame):
 
             if opcode == opcodedesc.RETURN_VALUE.index:
                 if not self.blockstack_non_empty():
+                    self.frame_finished_execution = True  # for generators
                     raise Return
                 w_returnvalue = self.popvalue()
                 block = self.unrollstack(SReturnValue.kind)