merge

diff --cc Cython/Compiler/Code.py
Simple merge

diff --cc Cython/Compiler/ExprNodes.py
index 7b7160d4874b4439e7e7503ab44e479c2d066513,bd45bae12d158df614d16d0640c5b71f2a846932..4bcee405e16a363c4da7b763569e6ca9005c7229
--- 1/Cython/Compiler/ExprNodes.py
--- 2/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@@ -5006,9 -5010,10 +5010,9 @@@ class YieldExprNode(ExprNode)
          else:
              code.put_init_to_py_none(Naming.retval_cname, py_object_type)
          saved = []
-         code.temp_allocator.reset()
+         code.funcstate.closure_temps.reset()
 -        code.putln('/* Save temporary variables */')
          for cname, type, manage_ref in code.funcstate.temps_in_use():
-             save_cname = code.temp_allocator.allocate_temp(type)
+             save_cname = code.funcstate.closure_temps.allocate_temp(type)
              saved.append((cname, save_cname, type))
              if type.is_pyobject:
                  code.put_xgiveref(cname)

diff --cc Cython/Compiler/Nodes.py
Simple merge