Version 3.8.0-14.0.dev

Merge f2929bf into dev

pkg/dart2wasm/lib/constant_evaluator.dart

@@ -16,8 +16,10 @@ import 'target.dart';
 class ConstantEvaluator extends kernel.ConstantEvaluator
     implements VMConstantEvaluator {
   final bool _checkBounds;
+  final bool _minify;
 
   final Procedure _dartInternalCheckBoundsGetter;
+  final Procedure _dartInternalMinifyGetter;
 
   ConstantEvaluator(
       WasmCompilerOptions options,
@@ -27,8 +29,11 @@ class ConstantEvaluator extends kernel.ConstantEvaluator
       ClassHierarchy classHierarchy,
       LibraryIndex libraryIndex)
       : _checkBounds = !options.translatorOptions.omitBoundsChecks,
+        _minify = options.translatorOptions.minify,
         _dartInternalCheckBoundsGetter = libraryIndex.getTopLevelProcedure(
-            "dart:_internal", "get:_checkBounds"),
+            "dart:_internal", "get:checkBounds"),
+        _dartInternalMinifyGetter =
+            libraryIndex.getTopLevelProcedure("dart:_internal", "get:minify"),
         super(
           target.dartLibrarySupport,
           target.constantsBackend,
@@ -48,6 +53,9 @@ class ConstantEvaluator extends kernel.ConstantEvaluator
     if (target == _dartInternalCheckBoundsGetter) {
       return canonicalize(BoolConstant(_checkBounds));
     }
+    if (target == _dartInternalMinifyGetter) {
+      return canonicalize(BoolConstant(_minify));
+    }
 
     return super.visitStaticGet(node);
   }
@@ -58,5 +66,6 @@ class ConstantEvaluator extends kernel.ConstantEvaluator
   // error if they are not).
   @override
   bool shouldEvaluateMember(Member node) =>
-      node == _dartInternalCheckBoundsGetter;
+      node == _dartInternalCheckBoundsGetter ||
+      node == _dartInternalMinifyGetter;
 }

pkg/front_end/lib/src/source/source_constructor_builder.dart

@@ -880,7 +880,7 @@ class DeclaredSourceConstructorBuilder
       List<DelayedDefaultValueCloner> delayedDefaultValueCloners) {
     if (_hasBuiltOutlines) return;
 
-    inferFormals(formals, classHierarchy);
+    formals?.infer(classHierarchy);
 
     if (isConst && isAugmenting) {
       origin.buildOutlineExpressions(

pkg/front_end/lib/src/source/source_factory_builder.dart

@@ -263,7 +263,7 @@ class SourceFactoryBuilder extends SourceFunctionBuilderImpl {
       List<DelayedDefaultValueCloner> delayedDefaultValueCloners) {
     if (_hasBuiltOutlines) return;
 
-    inferFormals(formals, classHierarchy);
+    formals?.infer(classHierarchy);
 
     if (_delayedDefaultValueCloner != null) {
       delayedDefaultValueCloners.add(_delayedDefaultValueCloner!);
@@ -563,7 +563,7 @@ class RedirectingFactoryBuilder extends SourceFactoryBuilder {
       List<DelayedDefaultValueCloner> delayedDefaultValueCloners) {
     if (_hasBuiltOutlines) return;
 
-    inferFormals(formals, classHierarchy);
+    formals?.infer(classHierarchy);
 
     if (isConst && isAugmenting) {
       origin.buildOutlineExpressions(

pkg/front_end/lib/src/source/source_function_builder.dart

@@ -423,7 +423,7 @@ abstract class SourceFunctionBuilderImpl extends SourceMemberBuilderImpl
   void buildOutlineExpressions(ClassHierarchy classHierarchy,
       List<DelayedDefaultValueCloner> delayedDefaultValueCloners) {
     if (!hasBuiltOutlineExpressions) {
-      inferFormals(formals, classHierarchy);
+      formals?.infer(classHierarchy);
 
       DeclarationBuilder? classOrExtensionBuilder =
           isClassMember || isExtensionMember || isExtensionTypeMember
@@ -575,11 +575,10 @@ void reportAugmentationMismatch(
       ]);
 }
 
-/// Ensures the type of each of the [formals] is inferred.
-void inferFormals(
-    List<FormalParameterBuilder>? formals, ClassHierarchy classHierarchy) {
-  if (formals != null) {
-    for (FormalParameterBuilder formal in formals) {
+extension FormalsMethods on List<FormalParameterBuilder> {
+  /// Ensures the type of each of the formals is inferred.
+  void infer(ClassHierarchy classHierarchy) {
+    for (FormalParameterBuilder formal in this) {
       TypeBuilder formalType = formal.type;
       if (formalType is InferableTypeBuilder) {
         formalType.inferType(classHierarchy);

pkg/front_end/test/coverage_suite_expected.dart

@@ -920,7 +920,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/source/source_constructor_builder.dart": (
-    hitCount: 891,
+    hitCount: 893,
     missCount: 0,
   ),
   // 100.0%.
@@ -941,13 +941,13 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/source/source_factory_builder.dart": (
-    hitCount: 593,
+    hitCount: 590,
     missCount: 0,
   ),
-  // 100.0%.
+  // 99.60317460317461%.
   "package:front_end/src/source/source_function_builder.dart": (
-    hitCount: 243,
-    missCount: 0,
+    hitCount: 251,
+    missCount: 1,
   ),
   // 100.0%.
   "package:front_end/src/source/source_library_builder.dart": (

sdk/lib/_internal/wasm/lib/boxed_double.dart

@@ -2,6 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import "dart:_error_utils";
 import 'dart:_boxed_int' show intHashCode;
 import 'dart:_internal' show doubleToIntBits, intBitsToDouble;
 import 'dart:_js_helper' show JS, jsStringToDartString;
@@ -362,10 +363,12 @@ final class BoxedDouble implements double {
     // See ECMAScript-262, 15.7.4.5 for details.
 
     // Step 2.
-    // fractionDigits < 0 || fractionDigits > 20
-    if (fractionDigits.gtU(20)) {
-      throw new RangeError.range(fractionDigits, 0, 20, "fractionDigits");
-    }
+    // 0 <= fractionDigits <= 20
+    RangeErrorUtils.checkValueBetweenZeroAndPositiveMax(
+      fractionDigits,
+      20,
+      "fractionDigits",
+    );
 
     // Step 3.
     double x = this;
@@ -406,10 +409,12 @@ final class BoxedDouble implements double {
 
     // Step 7.
     if (fractionDigits != null) {
-      // fractionDigits < 0 || fractionDigits > 20
-      if (fractionDigits.gtU(20)) {
-        throw new RangeError.range(fractionDigits, 0, 20, "fractionDigits");
-      }
+      // 0 <= fractionDigits <= 20
+      RangeErrorUtils.checkValueBetweenZeroAndPositiveMax(
+        fractionDigits,
+        20,
+        "fractionDigits",
+      );
     }
 
     if (isNaN) return "NaN";
@@ -442,9 +447,7 @@ final class BoxedDouble implements double {
     // look at the fractionDigits first.
 
     // Step 8.
-    if (precision < 1 || precision > 21) {
-      throw new RangeError.range(precision, 1, 21, "precision");
-    }
+    RangeErrorUtils.checkValueInInterval(precision, 1, 21, "precision");
 
     if (isNaN) return "NaN";
     if (this == double.infinity) return "Infinity";

sdk/lib/_internal/wasm/lib/boxed_int.dart

@@ -2,6 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import "dart:_error_utils";
 import 'dart:_boxed_double';
 import 'dart:_internal';
 import 'dart:_wasm';
@@ -306,8 +307,8 @@ final class BoxedInt implements int {
 
   // Returns pow(this, e) % m.
   int modPow(int e, int m) {
-    if (e < 0) throw new RangeError.range(e, 0, null, "exponent");
-    if (m <= 0) throw new RangeError.range(m, 1, null, "modulus");
+    RangeErrorUtils.checkNotNegative(e, "exponent");
+    RangeErrorUtils.checkPositive(m, "modulus");
     if (e == 0) return 1;
 
     // This is floor(sqrt(2^63)).
@@ -407,7 +408,7 @@ final class BoxedInt implements int {
 
   // Returns 1/this % m, with m > 0.
   int modInverse(int m) {
-    if (m <= 0) throw new RangeError.range(m, 1, null, "modulus");
+    RangeErrorUtils.checkPositive(m, "modulus");
     if (m == 1) return 0;
     int t = this;
     // t < 0 || t >= m, m is positive (checked above)

sdk/lib/_internal/wasm/lib/boxed_int_to_string.dart

@@ -2,6 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'dart:_error_utils';
 import 'dart:_internal';
 import 'dart:_string';
 
@@ -17,9 +18,7 @@ class BoxedInt {
 const _digits = "0123456789abcdefghijklmnopqrstuvwxyz";
 
 String _intToRadixString(int value, int radix) {
-  if (radix < 2 || 36 < radix) {
-    throw new RangeError.range(radix, 2, 36, "radix");
-  }
+  RangeErrorUtils.checkValueInInterval(radix, 2, 36, "radix");
   if (radix & (radix - 1) == 0) {
     return _toPow2String(value, radix);
   }

sdk/lib/_internal/wasm/lib/compact_hash.dart

@@ -763,7 +763,7 @@ class _CompactIterator<E> implements Iterator<E> {
   E? _current;
 
   _CompactIterator(this._table, this._data, this._len, this._offset, this._step)
-      : _checkSum = _table._checkSum;
+    : _checkSum = _table._checkSum;
 
   bool moveNext() {
     if (_table._isModifiedSince(_data, _checkSum)) {
@@ -812,7 +812,7 @@ class _CompactEntriesIterator<K, V> implements Iterator<MapEntry<K, V>> {
   MapEntry<K, V>? _current;
 
   _CompactEntriesIterator(this._table, this._data, this._len)
-      : _checkSum = _table._checkSum;
+    : _checkSum = _table._checkSum;
 
   bool moveNext() {
     if (_table._isModifiedSince(_data, _checkSum)) {
@@ -1248,13 +1248,13 @@ base class CompactLinkedCustomHashSet<E> extends _HashFieldBase
   ) : _validKey = validKey ?? TypeTest<E>().test;
 
   Set<R> cast<R>() => Set.castFrom<E, R>(this);
-  Set<E> toSet() => CompactLinkedCustomHashSet<E>(_equality, _hasher, _validKey)
-    ..addAll(this);
+  Set<E> toSet() =>
+      CompactLinkedCustomHashSet<E>(_equality, _hasher, _validKey)
+        ..addAll(this);
 }
 
 @pragma('wasm:prefer-inline')
 Map<K, V> createMapFromKeyValueListUnsafe<K, V>(
   WasmArray<Object?> keyValuePairData,
   int usedData,
-) =>
-    DefaultMap<K, V>().._populateUnsafe(keyValuePairData, usedData);
+) => DefaultMap<K, V>().._populateUnsafe(keyValuePairData, usedData);

sdk/lib/_internal/wasm/lib/convert_patch.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "dart:_compact_hash" show createMapFromKeyValueListUnsafe;
+import "dart:_error_utils";
 import "dart:_internal"
     show patch, POWERS_OF_TEN, unsafeCast, pushWasmArray, popWasmArray;
 import "dart:_js_string_convert";
@@ -2006,7 +2007,11 @@ class _Utf8Decoder {
 
   @patch
   String convertSingle(List<int> codeUnits, int start, int? maybeEnd) {
-    int end = RangeError.checkValidRange(start, maybeEnd, codeUnits.length);
+    int end = RangeErrorUtils.checkValidRange(
+      start,
+      maybeEnd,
+      codeUnits.length,
+    );
     if (start == end) return "";
 
     if (codeUnits is JSUint8ArrayImpl) {
@@ -2103,7 +2108,12 @@ class _Utf8Decoder {
 
   @patch
   String convertChunked(List<int> codeUnits, int start, int? maybeEnd) {
-    int end = RangeError.checkValidRange(start, maybeEnd, codeUnits.length);
+    int end = RangeErrorUtils.checkValidRange(
+      start,
+      maybeEnd,
+      codeUnits.length,
+    );
+    if (start == end) return "";
 
     final U8List bytes;
     int errorOffset;

sdk/lib/_internal/wasm/lib/core_patch.dart

@@ -9,7 +9,6 @@ import "dart:_internal"
         doubleToIntBits,
         EfficientLengthIterable,
         FixedLengthListMixin,
-        indexCheckWithName,
         intBitsToDouble,
         IterableElementError,
         jsonEncode,
@@ -25,6 +24,7 @@ import "dart:_internal"
         WasmStringBase,
         WasmTypedDataBase;
 
+import 'dart:_error_utils';
 import "dart:_internal" as _internal;
 
 import 'dart:_js_helper'