diff --git a/accepted/future-releases/nnbd/feature-specification.md b/accepted/future-releases/nnbd/feature-specification.md index e03ec941fe..443f04576a 100644 --- a/accepted/future-releases/nnbd/feature-specification.md +++ b/accepted/future-releases/nnbd/feature-specification.md @@ -6,6 +6,9 @@ Status: Draft ## CHANGELOG +2020.04.08 + - **CHANGE** `NNBD_TOP_MERGE` resolves all conflicting top types to `Object?`. + 2020.04.07 - Clarify semantics of boolean conditional checks in strong and weak mode. @@ -1136,13 +1139,13 @@ as: - `NNBD_TOP_MERGE(Object?, Object?) = Object?` - `NNBD_TOP_MERGE(dynamic, dynamic) = dynamic` - `NNBD_TOP_MERGE(void, void) = void` - - `NNBD_TOP_MERGE(Object?, void) = void` + - `NNBD_TOP_MERGE(Object?, void) = Object?` - And the reverse - - `NNBD_TOP_MERGE(dynamic, void) = void` + - `NNBD_TOP_MERGE(dynamic, void) = Object?` - And the reverse - `NNBD_TOP_MERGE(Object?, dynamic) = Object?` - And the reverse - - `NNBD_TOP_MERGE(Object*, void) = void` + - `NNBD_TOP_MERGE(Object*, void) = Object?` - And the reverse - `NNBD_TOP_MERGE(Object*, dynamic) = Object?` - And the reverse