forked from flutter/engine
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[CFE] Fix crash in incremental compiler caused by async redirecting f…
…actory Redirectig factories are encoded in a special way to "recover" their data (together with _redirecting# field). Before this CL, if a redirecting factory was async (that's an error) it was encoded so we couldn't load that dill again and that we would throw an error if we tried. This CL fixes that. Change-Id: If73ef5f662fb23bc083eb1af086d9d7694ca538c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/133061 Reviewed-by: Johnni Winther <johnniwinther@google.com> Commit-Queue: Jens Johansen <jensj@google.com>
- Loading branch information
Showing
4 changed files
with
69 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 12 additions & 48 deletions
60
pkg/front_end/testcases/incremental_initialize_from_dill/crash_test_1.yaml.world.1.expect
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,27 @@ | ||
| main = <No Member>; | ||
| library from "org-dartlang-test:///main.dart" as main { | ||
| library from "org-dartlang-test:///lib.dart" as lib { | ||
| // | ||
| // Problems in library: | ||
| // | ||
| // org-dartlang-test:///main.dart:3:11: Error: Functions marked 'async' must have a return type assignable to 'Future'. | ||
| // factory C.e4() async = C; | ||
| // ^^ | ||
| // | ||
| // org-dartlang-test:///main.dart:3:18: Error: Factory bodies can't use 'async', 'async*', or 'sync*'. | ||
| // org-dartlang-test:///lib.dart:3:18: Error: Factory bodies can't use 'async', 'async*', or 'sync*'. | ||
| // factory C.e4() async = C; | ||
| // ^^^^^ | ||
| // | ||
| // org-dartlang-test:///main.dart:3:24: Error: Expected a function body or '=>'. | ||
| // Try adding {}. | ||
| // factory C.e4() async = C; | ||
| // ^ | ||
| // | ||
| // org-dartlang-test:///main.dart:3:26: Error: A value of type 'Type' can't be assigned to a variable of type 'FutureOr<C>'. | ||
| // - 'Type' is from 'dart:core'. | ||
| // - 'FutureOr' is from 'dart:async'. | ||
| // - 'C' is from 'org-dartlang-test:///main.dart'. | ||
| // factory C.e4() async = C; | ||
| // ^ | ||
| // | ||
|
|
||
| class C extends dart.core::Object { | ||
| static field dynamic _redirecting# = <dynamic>[main::C::e4]; | ||
| constructor •() → main::C* | ||
| static field dynamic _redirecting# = <dynamic>[lib::C::e4]; | ||
| constructor •() → lib::C* | ||
| : super dart.core::Object::•() | ||
| ; | ||
| static factory e4() → main::C* /* originally async */ { | ||
| final dart.async::_AsyncAwaitCompleter<dynamic>* :async_completer = new dart.async::_AsyncAwaitCompleter::•<dynamic>(); | ||
| dart.async::FutureOr<dynamic>* :return_value; | ||
| dynamic :async_stack_trace; | ||
| dynamic :async_op_then; | ||
| dynamic :async_op_error; | ||
| dart.core::int* :await_jump_var = 0; | ||
| dynamic :await_ctx_var; | ||
| function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding | ||
| try { | ||
| #L1: | ||
| { | ||
| :return_value = let final<BottomType> #t1 = invalid-expression "org-dartlang-test:///main.dart:3:26: Error: A value of type 'Type' can't be assigned to a variable of type 'FutureOr<C>'.\n - 'Type' is from 'dart:core'.\n - 'FutureOr' is from 'dart:async'.\n - 'C' is from 'org-dartlang-test:///main.dart'.\n factory C.e4() async = C;\n ^" in main::C* as{TypeError} dart.async::FutureOr<main::C*>*; | ||
| break #L1; | ||
| } | ||
| dart.async::_completeOnAsyncReturn(:async_completer, :return_value); | ||
| return; | ||
| } | ||
| on dynamic catch(dynamic :exception, dynamic :stack_trace) { | ||
| :async_completer.{dart.async::Completer::completeError}(:exception, :stack_trace); | ||
| } | ||
| :async_stack_trace = dart.async::_asyncStackTraceHelper(:async_op); | ||
| :async_op_then = dart.async::_asyncThenWrapperHelper(:async_op); | ||
| :async_op_error = dart.async::_asyncErrorWrapperHelper(:async_op); | ||
| :async_completer.start(:async_op); | ||
| return :async_completer.{dart.async::Completer::future}; | ||
| } | ||
| static factory e4() → lib::C* | ||
| let dynamic #redirecting_factory = lib::C::• in invalid-expression; | ||
| } | ||
| } | ||
| library from "org-dartlang-test:///main.dart" as main { | ||
|
|
||
| import "org-dartlang-test:///lib.dart"; | ||
|
|
||
| static method main() → void { | ||
| main::C* c = main::C::e4(); | ||
| lib::C* c = new lib::C::•(); | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
pkg/front_end/testcases/incremental_initialize_from_dill/crash_test_1.yaml.world.2.expect
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| main = <No Member>; | ||
| library from "org-dartlang-test:///lib.dart" as lib { | ||
| // | ||
| // Problems in library: | ||
| // | ||
| // org-dartlang-test:///lib.dart:3:18: Error: Factory bodies can't use 'async', 'async*', or 'sync*'. | ||
| // factory C.e4() async = C; | ||
| // ^^^^^ | ||
| // | ||
|
|
||
| class C extends dart.core::Object { | ||
| static field dynamic _redirecting# = <dynamic>[lib::C::e4]; | ||
| constructor •() → lib::C* | ||
| : super dart.core::Object::•() | ||
| ; | ||
| static factory e4() → lib::C* | ||
| let dynamic #redirecting_factory = lib::C::• in invalid-expression; | ||
| } | ||
| } | ||
| library from "org-dartlang-test:///main.dart" as main { | ||
|
|
||
| import "org-dartlang-test:///lib.dart"; | ||
|
|
||
| static method main() → void { | ||
| lib::C* c = new lib::C::•(); | ||
| dart.core::print(c); | ||
| } | ||
| } |