Revert "[CFE] Set correct async markers in outline phase"

This reverts commit 2ad66bb.

Reason for revert: Seems to break some internal tests.

Original change's description:
> [CFE] Set correct async markers in outline phase
> 
> Change-Id: I4ac1fe1f4195dea2c20b8e55963b7e7dffc2d289
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/152330
> Reviewed-by: Johnni Winther <johnniwinther@google.com>
> Commit-Queue: Jens Johansen <jensj@google.com>

TBR=jensj@google.com,johnniwinther@google.com

Change-Id: Iaa272f1bee8f99dd93e9a351a03a67f67d83e871
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/152641
Reviewed-by: Jens Johansen <jensj@google.com>
Commit-Queue: Jens Johansen <jensj@google.com>

Author: jensjoha

pkg/front_end/lib/src/fasta/builder/enum_builder.dart

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

pkg/front_end/lib/src/fasta/builder/procedure_builder.dart

@@ -226,7 +226,6 @@ class SourceProcedureBuilder extends ProcedureBuilderImpl {
       int charEndOffset,
       Procedure referenceFrom,
       this._tearOffReferenceFrom,
-      AsyncMarker asyncModifier,
       [String nativeMethodName])
       : super(
             metadata,
@@ -242,9 +241,7 @@ class SourceProcedureBuilder extends ProcedureBuilderImpl {
             charOpenParenOffset,
             charEndOffset,
             referenceFrom,
-            nativeMethodName) {
-    this.asyncModifier = asyncModifier;
-  }
+            nativeMethodName);
 
   bool _typeEnsured = false;
   Set<ClassMember> _overrideDependencies;

pkg/front_end/lib/src/fasta/kernel/body_builder.dart

@@ -6546,6 +6546,27 @@ 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 {

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 AsyncMarker, InvalidType, Nullability, ProcedureKind, Variance;
+    show InvalidType, Nullability, ProcedureKind, Variance;
 
 import '../builder/constructor_reference_builder.dart';
 import '../builder/enum_builder.dart';
@@ -797,7 +797,6 @@ 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();
@@ -842,7 +841,6 @@ class OutlineBuilder extends StackListenerImpl {
         formalsOffset,
         endToken.charOffset,
         nativeMethodName,
-        asyncModifier,
         isTopLevel: true);
     nativeMethodName = null;
   }
@@ -975,7 +973,6 @@ class OutlineBuilder extends StackListenerImpl {
       pop();
     }
     assert(checkState(beginToken, [
-      ValueKinds.AsyncModifier,
       ValueKinds.FormalsOrNull,
       ValueKinds.Integer, // formals offset
       ValueKinds.TypeVariableListOrNull,
@@ -991,7 +988,6 @@ 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();
@@ -1185,7 +1181,6 @@ class OutlineBuilder extends StackListenerImpl {
           formalsOffset,
           endToken.charOffset,
           nativeMethodName,
-          asyncModifier,
           isTopLevel: false);
     }
     nativeMethodName = null;
@@ -1931,7 +1926,6 @@ class OutlineBuilder extends StackListenerImpl {
     if (kind == MethodBody.RedirectingFactoryBody) {
       redirectionTarget = nullIfParserRecovery(pop());
     }
-    AsyncMarker asyncModifier = pop();
     List<FormalParameterBuilder> formals = pop();
     int formalsOffset = pop();
     pop(); // type variables
@@ -1949,19 +1943,17 @@ class OutlineBuilder extends StackListenerImpl {
     }
     String documentationComment = getDocumentationComment(beginToken);
     libraryBuilder.addFactoryMethod(
-      documentationComment,
-      metadata,
-      modifiers,
-      name,
-      formals,
-      redirectionTarget,
-      beginToken.charOffset,
-      charOffset,
-      formalsOffset,
-      endToken.charOffset,
-      nativeMethodName,
-      asyncModifier,
-    );
+        documentationComment,
+        metadata,
+        modifiers,
+        name,
+        formals,
+        redirectionTarget,
+        beginToken.charOffset,
+        charOffset,
+        formalsOffset,
+        endToken.charOffset,
+        nativeMethodName);
     nativeMethodName = null;
     inConstructor = false;
   }
@@ -2068,7 +2060,6 @@ 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,

pkg/front_end/lib/src/fasta/source/source_library_builder.dart

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

pkg/front_end/lib/src/fasta/source/source_loader.dart

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

pkg/front_end/lib/src/fasta/source/stack_listener_impl.dart

@@ -25,27 +25,6 @@ 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(

pkg/front_end/lib/src/fasta/source/value_kinds.dart

@@ -64,8 +64,6 @@ 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 =

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 async 
+static method main() → dynamic
   ;
 static method expect(dynamic expected, dynamic actual) → dynamic
   ;

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 async 
+static method main() → dynamic
   ;
 static method expect(dynamic expected, dynamic actual) → dynamic
   ;