Skip to content

Commit b4b44d6

Browse files
jensjohacommit-bot@chromium.org
jensjoha
authored and
commit-bot@chromium.org
committed
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>
1 parent 718df63 commit b4b44d6

File tree

59 files changed

+179
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+179
-202
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ library fasta.enum_builder;
77
import 'package:kernel/ast.dart'
88
show
99
Arguments,
10-
AsyncMarker,
1110
Class,
1211
Constructor,
1312
ConstructorInvocation,
@@ -240,8 +239,7 @@ class EnumBuilder extends SourceClassBuilder {
240239
charOffset,
241240
charEndOffset,
242241
toStringReference,
243-
null,
244-
AsyncMarker.Sync);
242+
null);
245243
members["toString"] = toStringBuilder;
246244
String className = name;
247245
if (enumConstantInfos != null) {

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ class SourceProcedureBuilder extends ProcedureBuilderImpl {
226226
int charEndOffset,
227227
Procedure referenceFrom,
228228
this._tearOffReferenceFrom,
229-
AsyncMarker asyncModifier,
230229
[String nativeMethodName])
231230
: super(
232231
metadata,
@@ -242,9 +241,7 @@ class SourceProcedureBuilder extends ProcedureBuilderImpl {
242241
charOpenParenOffset,
243242
charEndOffset,
244243
referenceFrom,
245-
nativeMethodName) {
246-
this.asyncModifier = asyncModifier;
247-
}
244+
nativeMethodName);
248245

249246
bool _typeEnsured = false;
250247
Set<ClassMember> _overrideDependencies;

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6546,6 +6546,27 @@ String getNodeName(Object node) {
65466546
}
65476547
}
65486548

6549+
AsyncMarker asyncMarkerFromTokens(Token asyncToken, Token starToken) {
6550+
if (asyncToken == null || identical(asyncToken.stringValue, "sync")) {
6551+
if (starToken == null) {
6552+
return AsyncMarker.Sync;
6553+
} else {
6554+
assert(identical(starToken.stringValue, "*"));
6555+
return AsyncMarker.SyncStar;
6556+
}
6557+
} else if (identical(asyncToken.stringValue, "async")) {
6558+
if (starToken == null) {
6559+
return AsyncMarker.Async;
6560+
} else {
6561+
assert(identical(starToken.stringValue, "*"));
6562+
return AsyncMarker.AsyncStar;
6563+
}
6564+
} else {
6565+
return unhandled(asyncToken.lexeme, "asyncMarkerFromTokens",
6566+
asyncToken.charOffset, null);
6567+
}
6568+
}
6569+
65496570
/// A data holder used to hold the information about a label that is pushed on
65506571
/// the stack.
65516572
class Label {

‎pkg/front_end/lib/src/fasta/source/outline_builder.dart

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import 'package:_fe_analyzer_shared/src/parser/value_kind.dart';
2424
import 'package:_fe_analyzer_shared/src/scanner/scanner.dart' show Token;
2525

2626
import 'package:kernel/ast.dart'
27-
show AsyncMarker, InvalidType, Nullability, ProcedureKind, Variance;
27+
show InvalidType, Nullability, ProcedureKind, Variance;
2828

2929
import '../builder/constructor_reference_builder.dart';
3030
import '../builder/enum_builder.dart';
@@ -797,7 +797,6 @@ class OutlineBuilder extends StackListenerImpl {
797797
void endTopLevelMethod(Token beginToken, Token getOrSet, Token endToken) {
798798
debugEvent("endTopLevelMethod");
799799
MethodBody kind = pop();
800-
AsyncMarker asyncModifier = pop();
801800
List<FormalParameterBuilder> formals = pop();
802801
int formalsOffset = pop();
803802
List<TypeVariableBuilder> typeVariables = pop();
@@ -842,7 +841,6 @@ class OutlineBuilder extends StackListenerImpl {
842841
formalsOffset,
843842
endToken.charOffset,
844843
nativeMethodName,
845-
asyncModifier,
846844
isTopLevel: true);
847845
nativeMethodName = null;
848846
}
@@ -975,7 +973,6 @@ class OutlineBuilder extends StackListenerImpl {
975973
pop();
976974
}
977975
assert(checkState(beginToken, [
978-
ValueKinds.AsyncModifier,
979976
ValueKinds.FormalsOrNull,
980977
ValueKinds.Integer, // formals offset
981978
ValueKinds.TypeVariableListOrNull,
@@ -991,7 +988,6 @@ class OutlineBuilder extends StackListenerImpl {
991988
ValueKinds.Integer, // var/final/const offset
992989
ValueKinds.MetadataListOrNull,
993990
]));
994-
AsyncMarker asyncModifier = pop();
995991
List<FormalParameterBuilder> formals = pop();
996992
int formalsOffset = pop();
997993
List<TypeVariableBuilder> typeVariables = pop();
@@ -1185,7 +1181,6 @@ class OutlineBuilder extends StackListenerImpl {
11851181
formalsOffset,
11861182
endToken.charOffset,
11871183
nativeMethodName,
1188-
asyncModifier,
11891184
isTopLevel: false);
11901185
}
11911186
nativeMethodName = null;
@@ -1931,7 +1926,6 @@ class OutlineBuilder extends StackListenerImpl {
19311926
if (kind == MethodBody.RedirectingFactoryBody) {
19321927
redirectionTarget = nullIfParserRecovery(pop());
19331928
}
1934-
AsyncMarker asyncModifier = pop();
19351929
List<FormalParameterBuilder> formals = pop();
19361930
int formalsOffset = pop();
19371931
pop(); // type variables
@@ -1949,19 +1943,17 @@ class OutlineBuilder extends StackListenerImpl {
19491943
}
19501944
String documentationComment = getDocumentationComment(beginToken);
19511945
libraryBuilder.addFactoryMethod(
1952-
documentationComment,
1953-
metadata,
1954-
modifiers,
1955-
name,
1956-
formals,
1957-
redirectionTarget,
1958-
beginToken.charOffset,
1959-
charOffset,
1960-
formalsOffset,
1961-
endToken.charOffset,
1962-
nativeMethodName,
1963-
asyncModifier,
1964-
);
1946+
documentationComment,
1947+
metadata,
1948+
modifiers,
1949+
name,
1950+
formals,
1951+
redirectionTarget,
1952+
beginToken.charOffset,
1953+
charOffset,
1954+
formalsOffset,
1955+
endToken.charOffset,
1956+
nativeMethodName);
19651957
nativeMethodName = null;
19661958
inConstructor = false;
19671959
}
@@ -2068,7 +2060,6 @@ class OutlineBuilder extends StackListenerImpl {
20682060
@override
20692061
void handleAsyncModifier(Token asyncToken, Token starToken) {
20702062
debugEvent("AsyncModifier");
2071-
push(asyncMarkerFromTokens(asyncToken, starToken));
20722063
}
20732064

20742065
void addProblem(Message message, int charOffset, int length,

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import 'package:_fe_analyzer_shared/src/util/resolve_relative_uri.dart'
1616
import 'package:kernel/ast.dart'
1717
show
1818
Arguments,
19-
AsyncMarker,
2019
Class,
2120
Constructor,
2221
ConstructorInvocation,
@@ -2121,7 +2120,6 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
21212120
int charOpenParenOffset,
21222121
int charEndOffset,
21232122
String nativeMethodName,
2124-
AsyncMarker asyncModifier,
21252123
{bool isTopLevel}) {
21262124
MetadataCollector metadataCollector = loader.target.metadataCollector;
21272125
if (returnType == null) {
@@ -2196,7 +2194,6 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
21962194
charEndOffset,
21972195
referenceFrom,
21982196
tearOffReferenceFrom,
2199-
asyncModifier,
22002197
nativeMethodName);
22012198
metadataCollector?.setDocumentationComment(
22022199
procedureBuilder.procedure, documentationComment);
@@ -2219,8 +2216,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
22192216
int charOffset,
22202217
int charOpenParenOffset,
22212218
int charEndOffset,
2222-
String nativeMethodName,
2223-
AsyncMarker asyncModifier) {
2219+
String nativeMethodName) {
22242220
TypeBuilder returnType = addNamedType(
22252221
currentTypeParameterScopeBuilder.parent.name,
22262222
const NullabilityBuilder.omitted(),
@@ -2282,7 +2278,6 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
22822278
charEndOffset,
22832279
referenceFrom,
22842280
null,
2285-
asyncModifier,
22862281
nativeMethodName);
22872282
}
22882283

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import 'package:_fe_analyzer_shared/src/scanner/scanner.dart'
2929
import 'package:kernel/ast.dart'
3030
show
3131
Arguments,
32-
AsyncMarker,
3332
BottomType,
3433
Class,
3534
Component,
@@ -399,8 +398,7 @@ class SourceLoader extends Loader {
399398
-1,
400399
-1,
401400
null,
402-
null,
403-
AsyncMarker.Sync)
401+
null)
404402
..parent = parent;
405403
BodyBuilder listener = dietListener.createListener(
406404
builder, dietListener.memberScope,

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,6 @@ import 'source_library_builder.dart';
2525
abstract class StackListenerImpl extends StackListener {
2626
SourceLibraryBuilder get libraryBuilder;
2727

28-
AsyncMarker asyncMarkerFromTokens(Token asyncToken, Token starToken) {
29-
if (asyncToken == null || identical(asyncToken.stringValue, "sync")) {
30-
if (starToken == null) {
31-
return AsyncMarker.Sync;
32-
} else {
33-
assert(identical(starToken.stringValue, "*"));
34-
return AsyncMarker.SyncStar;
35-
}
36-
} else if (identical(asyncToken.stringValue, "async")) {
37-
if (starToken == null) {
38-
return AsyncMarker.Async;
39-
} else {
40-
assert(identical(starToken.stringValue, "*"));
41-
return AsyncMarker.AsyncStar;
42-
}
43-
} else {
44-
return unhandled(asyncToken.lexeme, "asyncMarkerFromTokens",
45-
asyncToken.charOffset, null);
46-
}
47-
}
48-
4928
// TODO(ahe): This doesn't belong here. Only implemented by body_builder.dart
5029
// and ast_builder.dart.
5130
void finishFunction(

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ class ValueKinds {
6464
static const ValueKind IdentifierOrNull =
6565
const SingleValueKind<type.Identifier>(NullValue.Identifier);
6666
static const ValueKind Integer = const SingleValueKind<int>();
67-
static const ValueKind AsyncModifier =
68-
const SingleValueKind<type.AsyncMarker>();
6967
static const ValueKind Formals =
7068
const SingleValueKind<List<type.FormalParameterBuilder>>();
7169
static const ValueKind FormalsOrNull =

‎pkg/front_end/testcases/extensions/deferred_explicit_access.dart.outline.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import self as self;
1111

1212
import "org-dartlang-testcase:///deferred_explicit_access_lib.dart" deferred as prefix;
1313

14-
static method main() → dynamic async
14+
static method main() → dynamic
1515
;
1616
static method expect(dynamic expected, dynamic actual) → dynamic
1717
;

‎pkg/front_end/testcases/extensions/deferred_import_hidden.dart.outline.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import self as self;
33

44
import "org-dartlang-testcase:///deferred_explicit_access_lib.dart" deferred as prefix;
55

6-
static method main() → dynamic async
6+
static method main() → dynamic
77
;
88
static method expect(dynamic expected, dynamic actual) → dynamic
99
;

‎pkg/front_end/testcases/general/async_function.dart.outline.expect

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ import "dart:core" as core;
66
import "dart:async";
77

88
static field core::List<core::String*>* stringList;
9-
static method asyncString() → asy::Future<core::String*>* async
9+
static method asyncString() → asy::Future<core::String*>*
1010
;
11-
static method asyncString2() → asy::Future<core::String*>* async
11+
static method asyncString2() → asy::Future<core::String*>*
1212
;
13-
static method syncStarString() → core::Iterable<core::String*>* sync*
13+
static method syncStarString() → core::Iterable<core::String*>*
1414
;
15-
static method syncStarString2() → core::Iterable<core::String*>* sync*
15+
static method syncStarString2() → core::Iterable<core::String*>*
1616
;
17-
static method asyncStarString() → asy::Stream<core::String*>* async*
17+
static method asyncStarString() → asy::Stream<core::String*>*
1818
;
19-
static method asyncStarString2() → asy::Stream<core::String*>* async*
19+
static method asyncStarString2() → asy::Stream<core::String*>*
2020
;
21-
static method main() → dynamic async
21+
static method main() → dynamic
2222
;

‎pkg/front_end/testcases/general/async_method_with_invalid_type.dart.outline.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
library;
22
import self as self;
33

4-
static method foo() → dynamic async
4+
static method foo() → dynamic
55
;

‎pkg/front_end/testcases/general/async_nested.dart.outline.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ class Node extends core::Object {
2323
abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic;
2424
abstract member-signature get runtimeType() → core::Type*;
2525
}
26-
static method main() → void async
26+
static method main() → void
2727
;

‎pkg/front_end/testcases/general/await.dart.outline.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
library;
22
import self as self;
33

4-
static method main() → dynamic async
4+
static method main() → dynamic
55
;

‎pkg/front_end/testcases/general/await_complex.dart.outline.expect

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,27 @@ static set topLevelSetter(dynamic val) → void
4343
;
4444
static method dummy() → dynamic
4545
;
46-
static method staticMembers() → dynamic async
46+
static method staticMembers() → dynamic
4747
;
48-
static method topLevelMembers() → dynamic async
48+
static method topLevelMembers() → dynamic
4949
;
50-
static method instanceMembers() → dynamic async
50+
static method instanceMembers() → dynamic
5151
;
52-
static method others() → dynamic async
52+
static method others() → dynamic
5353
;
54-
static method conditionals() → dynamic async
54+
static method conditionals() → dynamic
5555
;
56-
static method asserts() → dynamic async
56+
static method asserts() → dynamic
5757
;
58-
static method controlFlow() → dynamic async
58+
static method controlFlow() → dynamic
5959
;
60-
static method future<T extends core::Object* = dynamic>(self::future::T* value) → FutureOr<self::future::T*>* async
60+
static method future<T extends core::Object* = dynamic>(self::future::T* value) → FutureOr<self::future::T*>*
6161
;
6262
static method id<T extends core::Object* = dynamic>(self::id::T* value) → FutureOr<self::id::T*>*
6363
;
64-
static method intStream() → asy::Stream<core::int*>* async*
64+
static method intStream() → asy::Stream<core::int*>*
6565
;
66-
static method main() → dynamic async
66+
static method main() → dynamic
6767
;
6868
static method expect(dynamic expected, dynamic actual) → dynamic
6969
;

‎pkg/front_end/testcases/general/await_in_cascade.dart.outline.expect

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import "dart:async";
88
class C extends core::Object {
99
synthetic constructor •() → self::C*
1010
;
11-
method m() → asy::Future<core::List<core::int*>*>* async
11+
method m() → asy::Future<core::List<core::int*>*>*
1212
;
13-
method _m() → asy::Future<core::int*>* async
13+
method _m() → asy::Future<core::int*>*
1414
;
1515
abstract member-signature get _identityHashCode() → core::int*;
1616
abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*;
@@ -23,7 +23,7 @@ class C extends core::Object {
2323
abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic;
2424
abstract member-signature get runtimeType() → core::Type*;
2525
}
26-
static method main() → dynamic async
26+
static method main() → dynamic
2727
;
2828
static method expect(dynamic expected, dynamic actual) → dynamic
2929
;

‎pkg/front_end/testcases/general/bug33196.dart.outline.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ import "dart:async";
66

77
static method main() → dynamic
88
;
9-
static method returnsString() → FutureOr<core::String*>* async
9+
static method returnsString() → FutureOr<core::String*>*
1010
;

0 commit comments

Comments
 (0)