From 4c62d3d5e4f6708e9c2fab33e140b23a95605cff Mon Sep 17 00:00:00 2001 From: Leaf Petersen Date: Mon, 30 Mar 2020 22:40:46 -0700 Subject: [PATCH] Make TOP_MERGE resolve to Object? --- accepted/future-releases/nnbd/feature-specification.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/accepted/future-releases/nnbd/feature-specification.md b/accepted/future-releases/nnbd/feature-specification.md index 56488325f4..6b112bf66c 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.03.20 + - **CHANGE** `NNBD_TOP_MERGE` resolves all conflicting top types to `Object?`. + 2020.03.05 - Update grammar for null aware subscript. - Fix reversed subtype order in assignability. @@ -1085,13 +1088,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