Version 2.19.0-317.0.dev

Merge 770c9d7 into dev

Author: Dart CI

DEPS

@@ -122,7 +122,7 @@ vars = {
   # For more details, see https://github.com/dart-lang/sdk/issues/30164.
   "dart_style_rev": "f79a9828ad07e50d6e8352ac154cc16eb4d78d5c", # manually rev'd
 
-  "dartdoc_rev": "c8bc0655bbd4949cb49ca24ee9ff493439b7594c",
+  "dartdoc_rev": "5b3feb67f7db7dfb52f177744715fa058f9af6ad",
   "devtools_rev": "b21cd59f1f6bb60cacd59ba39e376d2a50d82f74",
   "ffi_rev": "fb5f2667826c0900e551d19101052f84e35f41bf",
   "file_rev": "b2e31cb6ef40b223701dbfa0b907fe58468484d7",

pkg/dart2wasm/bin/dart2wasm.dart

@@ -8,6 +8,7 @@ import 'dart:typed_data';
 import 'package:args/args.dart' as args;
 import 'package:front_end/src/api_unstable/vm.dart'
     show printDiagnosticMessage, resolveInputUri;
+import 'package:front_end/src/api_unstable/vm.dart' as fe;
 
 import 'package:dart2wasm/compile.dart';
 import 'package:dart2wasm/compiler_options.dart';
@@ -51,9 +52,17 @@ final List<Option> options = [
       "watch", (o, values) => o.translatorOptions.watchPoints = values),
   StringMultiOption(
       "define", (o, values) => o.environment = processEnvironment(values),
-      abbr: "D")
+      abbr: "D"),
+  StringMultiOption("enable-experiment",
+      (o, values) => o.feExperimentalFlags = processFeExperimentalFlags(values))
 ];
 
+Map<fe.ExperimentalFlag, bool> processFeExperimentalFlags(
+        List<String> experiments) =>
+    fe.parseExperimentalFlags(fe.parseExperimentalArguments(experiments),
+        onError: (error) => throw ArgumentError(error),
+        onWarning: (warning) => print(warning));
+
 Map<String, String> processEnvironment(List<String> defines) =>
     Map<String, String>.fromEntries(defines.map((d) {
       List<String> keyAndValue = d.split('=');

pkg/dart2wasm/lib/class_info.dart

@@ -29,7 +29,7 @@ class FieldIndex {
   static const vtableInstantiationFunction = 0;
   static const instantiationContextInner = 0;
   static const instantiationContextTypeArgumentsBase = 1;
-  static const typeIsNullable = 2;
+  static const typeIsDeclaredNullable = 2;
   static const interfaceTypeTypeArguments = 4;
   static const functionTypeNamedParameters = 6;
   static const typedListBaseLength = 2;
@@ -57,7 +57,8 @@ class FieldIndex {
     check(translator.hashFieldBaseClass, "_index", FieldIndex.hashBaseIndex);
     check(translator.hashFieldBaseClass, "_data", FieldIndex.hashBaseData);
     check(translator.functionClass, "context", FieldIndex.closureContext);
-    check(translator.typeClass, "isNullable", FieldIndex.typeIsNullable);
+    check(translator.typeClass, "isDeclaredNullable",
+        FieldIndex.typeIsDeclaredNullable);
     check(translator.interfaceTypeClass, "typeArguments",
         FieldIndex.interfaceTypeTypeArguments);
     check(translator.functionTypeClass, "namedParameters",

pkg/dart2wasm/lib/compile.dart

@@ -48,6 +48,7 @@ Future<Uint8List?> compileToModule(compiler.CompilerOptions options,
     ..librariesSpecificationUri = options.librariesSpecPath
     ..packagesFileUri = options.packagesPath
     ..environmentDefines = options.environment
+    ..explicitExperimentalFlags = options.feExperimentalFlags
     ..verbose = false
     ..onDiagnostic = diagnosticMessageHandler
     ..nnbdMode = NnbdMode.Strong;

pkg/dart2wasm/lib/compiler_options.dart

@@ -5,6 +5,7 @@
 import 'dart:io';
 
 import 'package:dart2wasm/translator.dart';
+import 'package:front_end/src/api_unstable/vm.dart' as fe;
 
 class CompilerOptions {
   final TranslatorOptions translatorOptions = TranslatorOptions();
@@ -16,6 +17,7 @@ class CompilerOptions {
   Uri mainUri;
   String outputFile;
   Map<String, String> environment = const {};
+  Map<fe.ExperimentalFlag, bool> feExperimentalFlags = const {};
 
   factory CompilerOptions.defaultOptions() =>
       CompilerOptions(mainUri: Uri(), outputFile: '');

pkg/dart2wasm/lib/constants.dart

@@ -729,7 +729,7 @@ class ConstantCreator extends ConstantVisitor<ConstantInfo?> {
 
       b.i32_const(info.classId);
       b.i32_const(initialIdentityHash);
-      types.encodeNullability(b, type);
+      b.i32_const(types.encodedNullability(type));
       b.i64_const(typeInfo.classId);
       constants.instantiateConstant(
           function, b, typeArgs, typeListExpectedType);
@@ -744,7 +744,7 @@ class ConstantCreator extends ConstantVisitor<ConstantInfo?> {
     return createConstant(constant, info.nonNullableType, (function, b) {
       b.i32_const(info.classId);
       b.i32_const(initialIdentityHash);
-      types.encodeNullability(b, type);
+      b.i32_const(types.encodedNullability(type));
       constants.instantiateConstant(
           function, b, typeArgument, types.nonNullableTypeType);
       b.struct_new(info.struct);
@@ -768,7 +768,7 @@ class ConstantCreator extends ConstantVisitor<ConstantInfo?> {
     return createConstant(constant, info.nonNullableType, (function, b) {
       b.i32_const(info.classId);
       b.i32_const(initialIdentityHash);
-      types.encodeNullability(b, type);
+      b.i32_const(types.encodedNullability(type));
       constants.instantiateConstant(
           function, b, returnTypeConstant, types.nonNullableTypeType);
       constants.instantiateConstant(function, b, positionalParametersConstant,
@@ -798,7 +798,7 @@ class ConstantCreator extends ConstantVisitor<ConstantInfo?> {
         return createConstant(constant, info.nonNullableType, (function, b) {
           b.i32_const(info.classId);
           b.i32_const(initialIdentityHash);
-          types.encodeNullability(b, type);
+          b.i32_const(types.encodedNullability(type));
           b.struct_new(info.struct);
         });
       } else {
@@ -812,13 +812,7 @@ class ConstantCreator extends ConstantVisitor<ConstantInfo?> {
       return createConstant(constant, info.nonNullableType, (function, b) {
         b.i32_const(info.classId);
         b.i32_const(initialIdentityHash);
-
-        // A type parameter's type nullability is undetermined when it's
-        // syntactically not declared nullable and the bound of the type
-        // parameter is nullable. Because we are encoding the declared
-        // nullability, we only declare a type parameter to be nullable if it is
-        // explicitly declared to be nullabe.
-        b.i32_const(type.declaredNullability == Nullability.nullable ? 1 : 0);
+        b.i32_const(types.encodedNullability(type));
         b.i64_const(environmentIndex);
         b.struct_new(info.struct);
       });
@@ -830,7 +824,7 @@ class ConstantCreator extends ConstantVisitor<ConstantInfo?> {
       return createConstant(constant, info.nonNullableType, (function, b) {
         b.i32_const(info.classId);
         b.i32_const(initialIdentityHash);
-        types.encodeNullability(b, type);
+        b.i32_const(types.encodedNullability(type));
         b.struct_new(info.struct);
       });
     }

pkg/dart2wasm/lib/types.dart

@@ -308,7 +308,7 @@ class Types {
       CodeGenerator codeGen, ClassInfo info, InterfaceType type) {
     w.Instructions b = codeGen.b;
     ClassInfo typeInfo = translator.classInfo[type.classNode]!;
-    encodeNullability(b, type);
+    b.i32_const(encodedNullability(type));
     b.i64_const(typeInfo.classId);
     _makeTypeList(codeGen, type.typeArguments);
   }
@@ -366,29 +366,14 @@ class Types {
 
   void _makeFutureOrType(CodeGenerator codeGen, FutureOrType type) {
     w.Instructions b = codeGen.b;
-    w.DefinedFunction function = codeGen.function;
-
-    // We canonicalize `FutureOr<T?>` to `FutureOr<T?>?`. However, we have to
-    // take special care to handle the case where we have
-    // undetermined nullability. To handle this, we emit the type argument, and
-    // read back its nullability at runtime.
-    if (type.nullability == Nullability.undetermined) {
-      w.ValueType typeArgumentType = makeType(codeGen, type.typeArgument);
-      w.Local typeArgumentTemporary = codeGen.addLocal(typeArgumentType);
-      b.local_tee(typeArgumentTemporary);
-      b.struct_get(typeClassInfo.struct, FieldIndex.typeIsNullable);
-      b.local_get(typeArgumentTemporary);
-      translator.convertType(function, typeArgumentType, nonNullableTypeType);
-    } else {
-      encodeNullability(b, type);
-      makeType(codeGen, type.typeArgument);
-    }
+    b.i32_const(encodedNullability(type));
+    makeType(codeGen, type.typeArgument);
   }
 
   void _makeFunctionType(
       CodeGenerator codeGen, ClassInfo info, FunctionType type) {
     w.Instructions b = codeGen.b;
-    encodeNullability(b, type);
+    b.i32_const(encodedNullability(type));
     makeType(codeGen, type.returnType);
     if (type.positionalParameters.every(_isTypeConstant)) {
       translator.constants.instantiateConstant(
@@ -469,7 +454,7 @@ class Types {
         // TODO(joshualitt): Implement generic function types and share most of
         // the logic with _makeFunctionType.
         print("Not implemented: RTI ${type}");
-        encodeNullability(b, type);
+        b.i32_const(encodedNullability(type));
       } else {
         _makeFunctionType(codeGen, info, type);
       }
@@ -515,7 +500,7 @@ class Types {
       if (isPotentiallyNullable) {
         b.br(resultLabel!);
         b.end(); // nullLabel
-        encodeNullability(b, type);
+        b.i32_const(encodedNullability(type));
         b.end(); // resultLabel
       }
     }
@@ -570,15 +555,6 @@ class Types {
     _endPotentiallyNullableBlock();
   }
 
-  /// Returns true if a given type is nullable, and false otherwise. This
-  /// function should not be used on [DartType]s with undetermined nullability.
-  bool isNullable(DartType type) {
-    Nullability nullability = type.nullability;
-    assert(nullability == Nullability.nullable ||
-        nullability == Nullability.nonNullable);
-    return nullability == Nullability.nullable ? true : false;
-  }
-
-  void encodeNullability(w.Instructions b, DartType type) =>
-      b.i32_const(isNullable(type) ? 1 : 0);
+  int encodedNullability(DartType type) =>
+      type.declaredNullability == Nullability.nullable ? 1 : 0;
 }

pkg/dds/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.5.0-dev
+- [DAP] `variables` requests now treat lists from `dart:typed_data` (such as `Uint8List`) like standard `List` instances and return their elements instead of class fields.
+- [DAP] `variables` requests now return information about the number of items in lists to allow the client to page through them.
+
 # 2.4.0
 - [DAP] Added support for sending progress notifications via `DartDebugAdapter.startProgressNotification`.
   Standard progress events are sent when a clients sets `supportsProgressReporting: true` in its capabilities,

pkg/dds/lib/src/dap/adapters/dart.dart

@@ -1619,8 +1619,12 @@ abstract class DartDebugAdapter<TL extends LaunchRequestArguments,
         ]);
       }
     } else if (vmData is vm.ObjRef) {
-      final object =
-          await _isolateManager.getObject(storedData.thread.isolate, vmData);
+      final object = await _isolateManager.getObject(
+        storedData.thread.isolate,
+        vmData,
+        offset: childStart,
+        count: childCount,
+      );
 
       if (object is vm.Sentinel) {
         variables.add(Variable(

pkg/dds/lib/src/dap/isolate_manager.dart

@@ -140,8 +140,17 @@ class IsolateManager {
   }
 
   Future<T> getObject<T extends vm.Response>(
-      vm.IsolateRef isolate, vm.ObjRef object) async {
-    final res = await _adapter.vmService?.getObject(isolate.id!, object.id!);
+    vm.IsolateRef isolate,
+    vm.ObjRef object, {
+    int? offset,
+    int? count,
+  }) async {
+    final res = await _adapter.vmService?.getObject(
+      isolate.id!,
+      object.id!,
+      offset: offset,
+      count: count,
+    );
     return res as T;
   }