In flow analysis tests, annotate doesNotComplete on functions rather than bodies.

Change-Id: I40476db016fd153ea4a013bcaa452775bcd960d6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108266
Commit-Queue: Paul Berry <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: stereotype441

pkg/analyzer/lib/src/util/ast_data_extractor.dart

@@ -4,8 +4,9 @@
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:front_end/src/testing/id.dart'
-    show ActualData, DataRegistry, Id, IdKind, NodeId;
+    show ActualData, DataRegistry, Id, IdKind, MemberId, NodeId;
 
 /// Abstract IR visitor for computing data corresponding to a node or element,
 /// and record it with a generic [Id]
@@ -29,7 +30,7 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<dynamic>
     registerValue(uri, node.offset, id, value, node);
   }
 
-  void computeForFunctionBody(FunctionBody node, NodeId id) {
+  void computeForMember(Declaration node, Id id) {
     if (id == null) return;
     T value = computeNodeValue(id, node);
     registerValue(uri, node.offset, id, value, node);
@@ -46,8 +47,18 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<dynamic>
   /// If `null` is returned, [node] has no associated data.
   T computeNodeValue(Id id, AstNode node);
 
-  NodeId createFunctionBodyId(FunctionBody node) =>
-      NodeId(_nodeOffset(node), IdKind.functionBody);
+  Id createMemberId(Declaration node) {
+    var element = node.declaredElement;
+    if (element.enclosingElement is CompilationUnitElement) {
+      var memberName = element.name;
+      if (element is PropertyAccessorElement && element.isSetter) {
+        memberName += '=';
+      }
+      return MemberId.internal(memberName);
+    }
+    throw UnimplementedError(
+        'TODO(paulberry): $element (${element.runtimeType})');
+  }
 
   NodeId createStatementId(Statement node) =>
       NodeId(_nodeOffset(node), IdKind.statement);
@@ -74,9 +85,11 @@ abstract class AstDataExtractor<T> extends GeneralizingAstVisitor<dynamic>
   }
 
   @override
-  visitFunctionBody(FunctionBody node) {
-    computeForFunctionBody(node, createFunctionBodyId(node));
-    super.visitFunctionBody(node);
+  visitFunctionDeclaration(FunctionDeclaration node) {
+    if (node.parent is CompilationUnit) {
+      computeForMember(node, createMemberId(node));
+    }
+    return super.visitFunctionDeclaration(node);
   }
 
   @override

pkg/analyzer/test/src/dart/resolution/flow_analysis_test.dart

@@ -352,7 +352,8 @@ void f() {
 
   test_do_true() async {
     await trackCode(r'''
-void f() /*functionBody: doesNotComplete*/ {
+/*member: f:doesNotComplete*/
+void f() {
   do {
     1;
   } while (true);
@@ -363,7 +364,8 @@ void f() /*functionBody: doesNotComplete*/ {
 
   test_exit_beforeSplitStatement() async {
     await trackCode(r'''
-void f(bool b, int i) /*functionBody: doesNotComplete*/ {
+/*member: f:doesNotComplete*/
+void f(bool b, int i) {
   return;
   /*statement: unreachable*/ Object _;
   /*statement: unreachable*/ do {} while (b);
@@ -379,7 +381,8 @@ void f(bool b, int i) /*functionBody: doesNotComplete*/ {
 
   test_for_condition_true() async {
     await trackCode(r'''
-void f() /*functionBody: doesNotComplete*/ {
+/*member: f:doesNotComplete*/
+void f() {
   for (; true;) {
     1;
   }
@@ -390,7 +393,8 @@ void f() /*functionBody: doesNotComplete*/ {
 
   test_for_condition_true_implicit() async {
     await trackCode(r'''
-void f() /*functionBody: doesNotComplete*/ {
+/*member: f:doesNotComplete*/
+void f() {
   for (;;) {
     1;
   }
@@ -414,7 +418,8 @@ void f() {
 
   test_functionBody_hasReturn() async {
     await trackCode(r'''
-int f() /*functionBody: doesNotComplete*/ {
+/*member: f:doesNotComplete*/
+int f() {
   return 42;
 }
 ''');
@@ -455,7 +460,8 @@ void f() {
 
   test_if_true_return() async {
     await trackCode(r'''
-void f() /*functionBody: doesNotComplete*/ {
+/*member: f:doesNotComplete*/
+void f() {
   1;
   if (true) {
     return;
@@ -572,7 +578,8 @@ void f() {
 
   test_tryCatchFinally_return_bodyCatch() async {
     await trackCode(r'''
-void f() /*functionBody: doesNotComplete*/ {
+/*member: f:doesNotComplete*/
+void f() {
   try {
     1;
     return;
@@ -605,7 +612,8 @@ void f() {
 
   test_tryFinally_return_body() async {
     await trackCode(r'''
-void f() /*functionBody: doesNotComplete*/ {
+/*member: f:doesNotComplete*/
+void f() {
   try {
     1;
     return;
@@ -630,7 +638,8 @@ void f() {
 
   test_while_true() async {
     await trackCode(r'''
-void f() /*functionBody: doesNotComplete*/ {
+/*member: f:doesNotComplete*/
+void f() {
   while (true) {
     1;
   }
@@ -668,7 +677,8 @@ void f(bool b) {
 
   test_while_true_continue() async {
     await trackCode(r'''
-void f() /*functionBody: doesNotComplete*/ {
+/*member: f:doesNotComplete*/
+void f() {
   while (true) {
     1;
     continue;
@@ -724,8 +734,12 @@ class _FlowAnalysisDataExtractor extends AstDataExtractor<Set<_FlowAssertion>> {
     if (_flowResult.unreachableNodes.contains(node)) {
       result.add(_FlowAssertion.unreachable);
     }
-    if (_flowResult.functionBodiesThatDontComplete.contains(node)) {
-      result.add(_FlowAssertion.doesNotComplete);
+    if (node is FunctionDeclaration) {
+      var body = node.functionExpression.body;
+      if (body != null &&
+          _flowResult.functionBodiesThatDontComplete.contains(body)) {
+        result.add(_FlowAssertion.doesNotComplete);
+      }
     }
     return result.isEmpty ? null : result;
   }

pkg/analyzer/test/util/id_equivalence_helper.dart

@@ -9,9 +9,10 @@
 // dart2js.
 
 import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer/dart/analysis/utilities.dart';
 import 'package:analyzer/dart/ast/ast.dart' hide Annotation;
 import 'package:front_end/src/testing/id.dart'
-    show ActualData, Id, IdValue, NodeId;
+    show ActualData, Id, IdValue, MemberId, NodeId;
 import 'package:sourcemap_testing/src/annotated_code_helper.dart';
 
 /// Checks [compiledData] against the expected data in [expectedMap] derived
@@ -395,6 +396,22 @@ class IdData<T> {
   int getOffsetFromId(Id id, Uri uri) {
     if (id is NodeId) {
       return id.value;
+    } else if (id is MemberId) {
+      if (id.className != null) {
+        throw UnimplementedError('TODO(paulberry): handle class members');
+      }
+      var name = id.memberName;
+      var unit =
+          parseString(content: code[uri].sourceCode, throwIfDiagnostics: false)
+              .unit;
+      for (var declaration in unit.declarations) {
+        if (declaration is FunctionDeclaration) {
+          if (declaration.name.name == name) {
+            return declaration.offset;
+          }
+        }
+      }
+      throw StateError('Member not found: $name');
     } else {
       throw StateError('Unexpected id ${id.runtimeType}');
     }

pkg/front_end/lib/src/testing/id.dart

@@ -12,7 +12,6 @@ enum IdKind {
   current,
   moveNext,
   statement,
-  functionBody,
 }
 
 /// Id for a code point or element.
@@ -65,8 +64,6 @@ class IdValue {
         return '$moveNextPrefix$value';
       case IdKind.statement:
         return '$statementPrefix$value';
-      case IdKind.functionBody:
-        return '$functionBodyPrefix$value';
     }
     throw new UnsupportedError("Unexpected id kind: ${id.kind}");
   }
@@ -80,7 +77,6 @@ class IdValue {
   static const String currentPrefix = "current: ";
   static const String moveNextPrefix = "moveNext: ";
   static const String statementPrefix = "statement: ";
-  static const String functionBodyPrefix = "functionBody: ";
 
   static IdValue decode(int offset, String text) {
     Id id;
@@ -125,9 +121,6 @@ class IdValue {
     } else if (text.startsWith(statementPrefix)) {
       id = new NodeId(offset, IdKind.statement);
       expected = text.substring(statementPrefix.length);
-    } else if (text.startsWith(functionBodyPrefix)) {
-      id = new NodeId(offset, IdKind.functionBody);
-      expected = text.substring(functionBodyPrefix.length);
     } else {
       id = new NodeId(offset, IdKind.node);
       expected = text;