From be57c7d5ea0f13a5bab4c194295930cd564779d4 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Thu, 9 Dec 2021 16:34:59 +0000 Subject: [PATCH] Remove explicit bool type hack. During the fix for https://github.com/dart-lang/language/issues/1785, an explicit `bool` type was added to the variable `nullable` to ensure that it would properly participate in type promotion while the fix was still being rolled out. Now that the fix is in place, this explicit type is no longer needed. TEST=standard trybots, TAP global presubmit, Golem Change-Id: Ib81ad436876e576f85c929c205d5831214e6a05a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/214821 Reviewed-by: Alexander Markov Commit-Queue: Paul Berry --- .dart_tool/package_config.json | 4 ++-- pkg/vm/lib/transformations/type_flow/transformer.dart | 8 +------- pkg/vm/pubspec.yaml | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index d50d6f5ef0c..0d8297b653e 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -11,7 +11,7 @@ "constraint, update this by running tools/generate_package_config.dart." ], "configVersion": 2, - "generated": "2021-11-15T17:34:02.415038", + "generated": "2021-12-09T13:52:42.287379", "generator": "tools/generate_package_config.dart", "packages": [ { @@ -760,7 +760,7 @@ "name": "vm", "rootUri": "../pkg/vm", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.15" }, { "name": "vm_service", diff --git a/pkg/vm/lib/transformations/type_flow/transformer.dart b/pkg/vm/lib/transformations/type_flow/transformer.dart index 1868a4db620..aa9af8f2671 100644 --- a/pkg/vm/lib/transformations/type_flow/transformer.dart +++ b/pkg/vm/lib/transformations/type_flow/transformer.dart @@ -315,13 +315,7 @@ class AnnotateKernel extends RecursiveVisitor { Constant? constantValue; bool isInt = false; - // Note: the explicit type `bool` is needed because the checked-in version - // of the CFE that we use for bootstrapping doesn't yet have constructor - // tearoffs enabled, and the fix for bug - // https://github.com/dart-lang/language/issues/1785 only takes effect when - // constructor tearoffs are enabled. TODO(paulberry): remove the type after - // the bootstrap CFE enables constructor tearoffs. - final bool nullable = type is NullableType; + final nullable = type is NullableType; if (nullable) { type = type.baseType; } diff --git a/pkg/vm/pubspec.yaml b/pkg/vm/pubspec.yaml index 3ae9534c209..4086172060c 100644 --- a/pkg/vm/pubspec.yaml +++ b/pkg/vm/pubspec.yaml @@ -4,7 +4,7 @@ description: VM specific Dart code and helper scripts publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.15.0 <3.0.0' dependencies: args: ^2.0.0