Merge closure tests and fixes.

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

diff --cc Cython/Compiler/Nodes.py
index c0816ee47dd041879b65e355ff485f9edaea35d8,67f795e35e1db1c36c7b92ff8f2b00ee4c3fd22a..204975d7e7fc726a754cad22b5daebcaa0b0f06c
--- 1/Cython/Compiler/Nodes.py
--- 2/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@@ -1100,13 -1095,10 +1104,12 @@@ class FuncDefNode(StatNode, BlockNode)
                  init = " = NULL"
              code.putln(
                  "%s%s;" % 
-                     (self.return_type.declaration_code(
-                         Naming.retval_cname),
-                     init))
+                     (self.return_type.declaration_code(Naming.retval_cname),
+                      init))
          tempvardecl_code = code.insertion_point()
          self.generate_keyword_list(code)
 +        if profile:
 +            code.put_trace_declarations()
          # ----- Extern library function declarations
          lenv.generate_library_function_declarations(code)
          # ----- GIL acquisition
@@@ -1619,11 -1612,12 +1628,13 @@@ class PyArgDeclNode(Node)
      # Argument which must be a Python object (used
      # for * and ** arguments).
      #
 -    # name   string
 -    # entry  Symtab.Entry
 +    # name        string
 +    # entry       Symtab.Entry
 +    # annotation  ExprNode or None   Py3 argument annotation
      child_attrs = []
-     
+ 
+     def generate_function_definitions(self, env, code):
+         self.entry.generate_function_definitions(env, code)
  
  class DecoratorNode(Node):
      # A decorator

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

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

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

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