[CFE] Set correct async markers in outline phase (2nd try)

This reverts commit b4b44d6. Change-Id: Iae68e6e84e0fbb214b22e1dec6788057f80a50ea Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153345 Reviewed-by: Johnni Winther <johnniwinther@google.com> Commit-Queue: Jens Johansen <jensj@google.com>
dart-lang · Jul 7, 2020 · 6de0f53 · 6de0f53
1 parent b6a0c50
commit 6de0f53
Show file tree

Hide file tree

Showing 67 changed files with 438 additions and 183 deletions.
diff --git a/pkg/front_end/lib/src/fasta/builder/class_builder.dart b/pkg/front_end/lib/src/fasta/builder/class_builder.dart
@@ -8,6 +8,7 @@ import 'package:kernel/ast.dart'
     show
         Arguments,
         AsExpression,
+        AsyncMarker,
         Class,
         Constructor,
         DartType,
@@ -873,6 +874,8 @@ abstract class ClassBuilderImpl extends DeclarationBuilderImpl
     procedure.function.body = new ReturnStatement(result)
       ..fileOffset = procedure.fileOffset;
     procedure.function.body.parent = procedure.function;
+    procedure.function.asyncMarker = AsyncMarker.Sync;
+    procedure.function.dartAsyncMarker = AsyncMarker.Sync;
 
     procedure.isAbstract = false;
     procedure.isNoSuchMethodForwarder = true;

diff --git a/pkg/front_end/lib/src/fasta/builder/enum_builder.dart b/pkg/front_end/lib/src/fasta/builder/enum_builder.dart
@@ -7,6 +7,7 @@ library fasta.enum_builder;
 import 'package:kernel/ast.dart'
     show
         Arguments,
+        AsyncMarker,
         Class,
         Constructor,
         ConstructorInvocation,
@@ -239,7 +240,8 @@ class EnumBuilder extends SourceClassBuilder {
         charOffset,
         charEndOffset,
         toStringReference,
-        null);
+        null,
+        AsyncMarker.Sync);
     members["toString"] = toStringBuilder;
     String className = name;
     if (enumConstantInfos != null) {

diff --git a/pkg/front_end/lib/src/fasta/builder/procedure_builder.dart b/pkg/front_end/lib/src/fasta/builder/procedure_builder.dart
@@ -226,6 +226,7 @@ class SourceProcedureBuilder extends ProcedureBuilderImpl {
       int charEndOffset,
       Procedure referenceFrom,
       this._tearOffReferenceFrom,
+      AsyncMarker asyncModifier,
       [String nativeMethodName])
       : super(
             metadata,
@@ -241,7 +242,9 @@ class SourceProcedureBuilder extends ProcedureBuilderImpl {
             charOpenParenOffset,
             charEndOffset,
             referenceFrom,
-            nativeMethodName);
+            nativeMethodName) {
+    this.asyncModifier = asyncModifier;
+  }
 
   bool _typeEnsured = false;
   Set<ClassMember> _overrideDependencies;

diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -6546,27 +6546,6 @@ String getNodeName(Object node) {
   }
 }
 
-AsyncMarker asyncMarkerFromTokens(Token asyncToken, Token starToken) {
-  if (asyncToken == null || identical(asyncToken.stringValue, "sync")) {
-    if (starToken == null) {
-      return AsyncMarker.Sync;
-    } else {
-      assert(identical(starToken.stringValue, "*"));
-      return AsyncMarker.SyncStar;
-    }
-  } else if (identical(asyncToken.stringValue, "async")) {
-    if (starToken == null) {
-      return AsyncMarker.Async;
-    } else {
-      assert(identical(starToken.stringValue, "*"));
-      return AsyncMarker.AsyncStar;
-    }
-  } else {
-    return unhandled(asyncToken.lexeme, "asyncMarkerFromTokens",
-        asyncToken.charOffset, null);
-  }
-}
-
 /// A data holder used to hold the information about a label that is pushed on
 /// the stack.
 class Label {

diff --git a/pkg/front_end/lib/src/fasta/source/outline_builder.dart b/pkg/front_end/lib/src/fasta/source/outline_builder.dart
@@ -24,7 +24,7 @@ import 'package:_fe_analyzer_shared/src/parser/value_kind.dart';
 import 'package:_fe_analyzer_shared/src/scanner/scanner.dart' show Token;
 
 import 'package:kernel/ast.dart'
-    show InvalidType, Nullability, ProcedureKind, Variance;
+    show AsyncMarker, InvalidType, Nullability, ProcedureKind, Variance;
 
 import '../builder/constructor_reference_builder.dart';
 import '../builder/enum_builder.dart';
@@ -797,6 +797,7 @@ class OutlineBuilder extends StackListenerImpl {
   void endTopLevelMethod(Token beginToken, Token getOrSet, Token endToken) {
     debugEvent("endTopLevelMethod");
     MethodBody kind = pop();
+    AsyncMarker asyncModifier = pop();
     List<FormalParameterBuilder> formals = pop();
     int formalsOffset = pop();
     List<TypeVariableBuilder> typeVariables = pop();
@@ -841,6 +842,7 @@ class OutlineBuilder extends StackListenerImpl {
         formalsOffset,
         endToken.charOffset,
         nativeMethodName,
+        asyncModifier,
         isTopLevel: true);
     nativeMethodName = null;
   }
@@ -973,6 +975,7 @@ class OutlineBuilder extends StackListenerImpl {
       pop();
     }
     assert(checkState(beginToken, [
+      ValueKinds.AsyncModifier,
       ValueKinds.FormalsOrNull,
       ValueKinds.Integer, // formals offset
       ValueKinds.TypeVariableListOrNull,
@@ -988,6 +991,7 @@ class OutlineBuilder extends StackListenerImpl {
       ValueKinds.Integer, // var/final/const offset
       ValueKinds.MetadataListOrNull,
     ]));
+    AsyncMarker asyncModifier = pop();
     List<FormalParameterBuilder> formals = pop();
     int formalsOffset = pop();
     List<TypeVariableBuilder> typeVariables = pop();
@@ -1181,6 +1185,7 @@ class OutlineBuilder extends StackListenerImpl {
           formalsOffset,
           endToken.charOffset,
           nativeMethodName,
+          asyncModifier,
           isTopLevel: false);
     }
     nativeMethodName = null;
@@ -1926,6 +1931,7 @@ class OutlineBuilder extends StackListenerImpl {
     if (kind == MethodBody.RedirectingFactoryBody) {
       redirectionTarget = nullIfParserRecovery(pop());
     }
+    AsyncMarker asyncModifier = pop();
     List<FormalParameterBuilder> formals = pop();
     int formalsOffset = pop();
     pop(); // type variables
@@ -1943,17 +1949,19 @@ class OutlineBuilder extends StackListenerImpl {
     }
     String documentationComment = getDocumentationComment(beginToken);
     libraryBuilder.addFactoryMethod(
-        documentationComment,
-        metadata,
-        modifiers,
-        name,
-        formals,
-        redirectionTarget,
-        beginToken.charOffset,
-        charOffset,
-        formalsOffset,
-        endToken.charOffset,
-        nativeMethodName);
+      documentationComment,
+      metadata,
+      modifiers,
+      name,
+      formals,
+      redirectionTarget,
+      beginToken.charOffset,
+      charOffset,
+      formalsOffset,
+      endToken.charOffset,
+      nativeMethodName,
+      asyncModifier,
+    );
     nativeMethodName = null;
     inConstructor = false;
   }
@@ -2060,6 +2068,7 @@ class OutlineBuilder extends StackListenerImpl {
   @override
   void handleAsyncModifier(Token asyncToken, Token starToken) {
     debugEvent("AsyncModifier");
+    push(asyncMarkerFromTokens(asyncToken, starToken));
   }
 
   void addProblem(Message message, int charOffset, int length,

diff --git a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
@@ -16,6 +16,7 @@ import 'package:_fe_analyzer_shared/src/util/resolve_relative_uri.dart'
 import 'package:kernel/ast.dart'
     show
         Arguments,
+        AsyncMarker,
         Class,
         Constructor,
         ConstructorInvocation,
@@ -2120,6 +2121,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
       int charOpenParenOffset,
       int charEndOffset,
       String nativeMethodName,
+      AsyncMarker asyncModifier,
       {bool isTopLevel}) {
     MetadataCollector metadataCollector = loader.target.metadataCollector;
     if (returnType == null) {
@@ -2194,6 +2196,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
         charEndOffset,
         referenceFrom,
         tearOffReferenceFrom,
+        asyncModifier,
         nativeMethodName);
     metadataCollector?.setDocumentationComment(
         procedureBuilder.procedure, documentationComment);
@@ -2216,7 +2219,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
       int charOffset,
       int charOpenParenOffset,
       int charEndOffset,
-      String nativeMethodName) {
+      String nativeMethodName,
+      AsyncMarker asyncModifier) {
     TypeBuilder returnType = addNamedType(
         currentTypeParameterScopeBuilder.parent.name,
         const NullabilityBuilder.omitted(),
@@ -2278,6 +2282,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
           charEndOffset,
           referenceFrom,
           null,
+          asyncModifier,
           nativeMethodName);
     }
 

diff --git a/pkg/front_end/lib/src/fasta/source/source_loader.dart b/pkg/front_end/lib/src/fasta/source/source_loader.dart
@@ -29,6 +29,7 @@ import 'package:_fe_analyzer_shared/src/scanner/scanner.dart'
 import 'package:kernel/ast.dart'
     show
         Arguments,
+        AsyncMarker,
         BottomType,
         Class,
         Component,
@@ -398,7 +399,8 @@ class SourceLoader extends Loader {
         -1,
         -1,
         null,
-        null)
+        null,
+        AsyncMarker.Sync)
       ..parent = parent;
     BodyBuilder listener = dietListener.createListener(
         builder, dietListener.memberScope,

diff --git a/pkg/front_end/lib/src/fasta/source/stack_listener_impl.dart b/pkg/front_end/lib/src/fasta/source/stack_listener_impl.dart
@@ -25,6 +25,27 @@ import 'source_library_builder.dart';
 abstract class StackListenerImpl extends StackListener {
   SourceLibraryBuilder get libraryBuilder;
 
+  AsyncMarker asyncMarkerFromTokens(Token asyncToken, Token starToken) {
+    if (asyncToken == null || identical(asyncToken.stringValue, "sync")) {
+      if (starToken == null) {
+        return AsyncMarker.Sync;
+      } else {
+        assert(identical(starToken.stringValue, "*"));
+        return AsyncMarker.SyncStar;
+      }
+    } else if (identical(asyncToken.stringValue, "async")) {
+      if (starToken == null) {
+        return AsyncMarker.Async;
+      } else {
+        assert(identical(starToken.stringValue, "*"));
+        return AsyncMarker.AsyncStar;
+      }
+    } else {
+      return unhandled(asyncToken.lexeme, "asyncMarkerFromTokens",
+          asyncToken.charOffset, null);
+    }
+  }
+
   // TODO(ahe): This doesn't belong here. Only implemented by body_builder.dart
   // and ast_builder.dart.
   void finishFunction(

diff --git a/pkg/front_end/lib/src/fasta/source/value_kinds.dart b/pkg/front_end/lib/src/fasta/source/value_kinds.dart
@@ -64,6 +64,8 @@ class ValueKinds {
   static const ValueKind IdentifierOrNull =
       const SingleValueKind<type.Identifier>(NullValue.Identifier);
   static const ValueKind Integer = const SingleValueKind<int>();
+  static const ValueKind AsyncModifier =
+      const SingleValueKind<type.AsyncMarker>();
   static const ValueKind Formals =
       const SingleValueKind<List<type.FormalParameterBuilder>>();
   static const ValueKind FormalsOrNull =

diff --git a/pkg/front_end/testcases/extensions/deferred_explicit_access.dart.outline.expect b/pkg/front_end/testcases/extensions/deferred_explicit_access.dart.outline.expect
@@ -11,7 +11,7 @@ import self as self;
 
 import "org-dartlang-testcase:///deferred_explicit_access_lib.dart" deferred as prefix;
 
-static method main() → dynamic
+static method main() → dynamic async 
   ;
 static method expect(dynamic expected, dynamic actual) → dynamic
   ;

diff --git a/pkg/front_end/testcases/extensions/deferred_import_hidden.dart.outline.expect b/pkg/front_end/testcases/extensions/deferred_import_hidden.dart.outline.expect
@@ -3,7 +3,7 @@ import self as self;
 
 import "org-dartlang-testcase:///deferred_explicit_access_lib.dart" deferred as prefix;
 
-static method main() → dynamic
+static method main() → dynamic async 
   ;
 static method expect(dynamic expected, dynamic actual) → dynamic
   ;

diff --git a/pkg/front_end/testcases/general/async_function.dart.outline.expect b/pkg/front_end/testcases/general/async_function.dart.outline.expect
@@ -6,17 +6,17 @@ import "dart:core" as core;
 import "dart:async";
 
 static field core::List<core::String*>* stringList;
-static method asyncString() → asy::Future<core::String*>*
+static method asyncString() → asy::Future<core::String*>* async 
   ;
-static method asyncString2() → asy::Future<core::String*>*
+static method asyncString2() → asy::Future<core::String*>* async 
   ;
-static method syncStarString() → core::Iterable<core::String*>*
+static method syncStarString() → core::Iterable<core::String*>* sync* 
   ;
-static method syncStarString2() → core::Iterable<core::String*>*
+static method syncStarString2() → core::Iterable<core::String*>* sync* 
   ;
-static method asyncStarString() → asy::Stream<core::String*>*
+static method asyncStarString() → asy::Stream<core::String*>* async* 
   ;
-static method asyncStarString2() → asy::Stream<core::String*>*
+static method asyncStarString2() → asy::Stream<core::String*>* async* 
   ;
-static method main() → dynamic
+static method main() → dynamic async 
   ;
diff --git a/pkg/front_end/testcases/general/async_method_with_invalid_type.dart.outline.expect b/pkg/front_end/testcases/general/async_method_with_invalid_type.dart.outline.expect
@@ -1,5 +1,5 @@
 library;
 import self as self;
 
-static method foo() → dynamic
+static method foo() → dynamic async 
   ;
diff --git a/pkg/front_end/testcases/general/async_nested.dart.outline.expect b/pkg/front_end/testcases/general/async_nested.dart.outline.expect
@@ -23,5 +23,5 @@ class Node extends core::Object {
   abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic;
   abstract member-signature get runtimeType() → core::Type*;
 }
-static method main() → void
+static method main() → void async 
   ;
diff --git a/pkg/front_end/testcases/general/await.dart.outline.expect b/pkg/front_end/testcases/general/await.dart.outline.expect
@@ -1,5 +1,5 @@
 library;
 import self as self;
 
-static method main() → dynamic
+static method main() → dynamic async 
   ;
diff --git a/pkg/front_end/testcases/general/await_complex.dart.outline.expect b/pkg/front_end/testcases/general/await_complex.dart.outline.expect
@@ -43,27 +43,27 @@ static set topLevelSetter(dynamic val) → void
   ;
 static method dummy() → dynamic
   ;
-static method staticMembers() → dynamic
+static method staticMembers() → dynamic async 
   ;
-static method topLevelMembers() → dynamic
+static method topLevelMembers() → dynamic async 
   ;
-static method instanceMembers() → dynamic
+static method instanceMembers() → dynamic async 
   ;
-static method others() → dynamic
+static method others() → dynamic async 
   ;
-static method conditionals() → dynamic
+static method conditionals() → dynamic async 
   ;
-static method asserts() → dynamic
+static method asserts() → dynamic async 
   ;
-static method controlFlow() → dynamic
+static method controlFlow() → dynamic async 
   ;
-static method future<T extends core::Object* = dynamic>(self::future::T* value) → FutureOr<self::future::T*>*
+static method future<T extends core::Object* = dynamic>(self::future::T* value) → FutureOr<self::future::T*>* async 
   ;
 static method id<T extends core::Object* = dynamic>(self::id::T* value) → FutureOr<self::id::T*>*
   ;
-static method intStream() → asy::Stream<core::int*>*
+static method intStream() → asy::Stream<core::int*>* async* 
   ;
-static method main() → dynamic
+static method main() → dynamic async 
   ;
 static method expect(dynamic expected, dynamic actual) → dynamic
   ;

diff --git a/pkg/front_end/testcases/general/await_in_cascade.dart.outline.expect b/pkg/front_end/testcases/general/await_in_cascade.dart.outline.expect
@@ -8,9 +8,9 @@ import "dart:async";
 class C extends core::Object {
   synthetic constructor •() → self::C*
     ;
-  method m() → asy::Future<core::List<core::int*>*>*
+  method m() → asy::Future<core::List<core::int*>*>* async 
     ;
-  method _m() → asy::Future<core::int*>*
+  method _m() → asy::Future<core::int*>* async 
     ;
   abstract member-signature get _identityHashCode() → core::int*;
   abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*;
@@ -23,7 +23,7 @@ class C extends core::Object {
   abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic;
   abstract member-signature get runtimeType() → core::Type*;
 }
-static method main() → dynamic
+static method main() → dynamic async 
   ;
 static method expect(dynamic expected, dynamic actual) → dynamic
   ;