c60199cf86
This is a re-landing of https://github.com/dart-lang/sdk/commit/06ebf884db61b97a60b1578560678329cd51bf61 after the fix was submitted separately at https://github.com/dart-lang/sdk/commit/e3b9c2860e46f9d673ffc3129ede2a11c6125d06 Original review: https://dart-review.googlesource.com/c/sdk/+/46942 Issue: https://github.com/dart-lang/sdk/issues/30480 Change-Id: I2d3a10acb9b5af0184b3d1504acb2f4ebebfff8a Reviewed-on: https://dart-review.googlesource.com/48440 Reviewed-by: Ryan Macnak <rmacnak@google.com> Commit-Queue: Alexander Markov <alexmarkov@google.com>