@@ -769,8 +769,8 @@ class Annotation extends Expr {
     or
     result = any(Parameter p | p.getAnnotation() = this)
     or
-    exists(FunctionExpr f |
-      this = f.getReturns() and result = f.getInnerScope().getReturnNode().getNode()
+    exists(FunctionExpr f, Return r |
+      this = f.getReturns() and r.getScope() = f.getInnerScope() and result = r.getValue()
     )
   }
 }
 
@@ -0,0 +1,6 @@
+testFailures
+debug_callableNotUnique
+pointsTo_found_typeTracker_notFound
+typeTracker_found_pointsTo_notFound
+| type_annotations.py:6:5:6:14 | ControlFlowNode for Attribute() | Foo.method |
+| type_annotations.py:16:5:16:14 | ControlFlowNode for Attribute() | Foo.method |
@@ -0,0 +1 @@
+../CallGraph/InlineCallGraphTest.ql
@@ -0,0 +1,33 @@
+class Foo:
+    def method(self):
+        pass
+
+def test_parameter_annotation(x: Foo):
+    x.method() #$ tt=Foo.method
+
+def test_no_parameter_annotation(x):
+    x.method()
+
+def function_with_return_annotation() -> Foo:
+    return eval("Foo()")
+
+def test_return_annotation():
+    x = function_with_return_annotation() #$ pt,tt=function_with_return_annotation
+    x.method() #$ tt=Foo.method
+
+def function_without_return_annotation():
+    return eval("Foo()")
+
+def test_no_return_annotation():
+    x = function_without_return_annotation() #$ pt,tt=function_without_return_annotation
+    x.method()
+
+def test_variable_annotation():
+    x = eval("Foo()")
+    x : Foo
+    # Currently fails because there is no flow from the class definition to the type annotation.
+    x.method() #$ MISSING: tt=Foo.method
+
+def test_no_variable_annotation():
+    x = eval("Foo()")
+    x.method()
Original file line number	Diff line number	Diff line change
`@@ -769,8 +769,8 @@ class Annotation extends Expr {`
`769`	`769`	`or`
`770`	`770`	`result = any(Parameter p \| p.getAnnotation() = this)`
`771`	`771`	`or`
`772`		`- exists(FunctionExpr f \|`
`773`		`- this = f.getReturns() and result = f.getInnerScope().getReturnNode().getNode()`
	`772`	`+ exists(FunctionExpr f, Return r \|`
	`773`	`+ this = f.getReturns() and r.getScope() = f.getInnerScope() and result = r.getValue()`
`774`	`774`	`)`
`775`	`775`	`}`
`776`	`776`	`}`