Evaluate parameter annotations in outer scope

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/test_parser.py

@@ -121,3 +121,9 @@ def test_underscore_in_numbers():
     assert eval('0b1_1') == 0b11
     assert eval('0o1_7') == 0o17
     assert eval('0x1_f') == 0x1f
+
+
+def test_annotation_scope():
+    def foo(object: object):
+        pass
+    assert foo.__annotations__['object'] == object

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/FactorySSTVisitor.java

@@ -783,6 +783,12 @@ public PNode visit(FunctionDefSSTNode node) {
             returnTarget = new ReturnTargetNode(body, nodeFactory.createReadLocal(scopeEnvironment.getReturnSlot()));
         }
 
+        SourceSection sourceSection = createSourceSection(node.startOffset, node.endOffset);
+        returnTarget.assignSourceSection(sourceSection);
+
+        scopeEnvironment.setCurrentScope(node.functionScope.getParent());
+        ExpressionNode[] defaults = node.argBuilder.getDefaultParameterValues(this);
+        FunctionDefinitionNode.KwDefaultExpressionNode[] kwDefaults = node.argBuilder.getKwDefaultParameterValues(this);
         Map<String, SSTNode> sstAnnotations = node.argBuilder.getAnnotatedArgs();
         Map<String, ExpressionNode> annotations = null;
         if (sstAnnotations != null && !sstAnnotations.isEmpty()) {
@@ -792,12 +798,6 @@ public PNode visit(FunctionDefSSTNode node) {
                 annotations.put(argName, (ExpressionNode) sstType.accept(this));
             }
         }
-        SourceSection sourceSection = createSourceSection(node.startOffset, node.endOffset);
-        returnTarget.assignSourceSection(sourceSection);
-
-        scopeEnvironment.setCurrentScope(node.functionScope.getParent());
-        ExpressionNode[] defaults = node.argBuilder.getDefaultParameterValues(this);
-        FunctionDefinitionNode.KwDefaultExpressionNode[] kwDefaults = node.argBuilder.getKwDefaultParameterValues(this);
         scopeEnvironment.setCurrentScope(node.functionScope);
 
         /**