Version 3.3.0-225.0.dev

Merge 3a69a02 into dev
dart-lang · Dec 13, 2023 · 3dc0ba2 · 3dc0ba2
2 parents 78dde11 + 3a69a02
commit 3dc0ba2
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 16 deletions.
diff --git a/pkg/dds_service_extensions/CHANGELOG.md b/pkg/dds_service_extensions/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.6.3
+- Updated `vm_service` version to `^14.0.0`.
+
 # 1.6.2
 - Updated `vm_service` version to `^13.0.0`.
 

diff --git a/pkg/dds_service_extensions/pubspec.yaml b/pkg/dds_service_extensions/pubspec.yaml
@@ -1,5 +1,5 @@
 name: dds_service_extensions
-version: 1.6.2
+version: 1.6.3
 description: >-
   Extension methods for `package:vm_service`, used to make requests a
   Dart Development Service (DDS) instance.
@@ -11,7 +11,7 @@ environment:
 dependencies:
   async: ^2.4.1
   dap: ^1.0.0
-  vm_service: ^13.0.0
+  vm_service: ^14.0.0
 
 # We use 'any' version constraints here as we get our package versions from
 # the dart-lang/sdk repo's DEPS file. Note that this is a special case; the

diff --git a/pkg/dev_compiler/lib/src/kernel/compiler.dart b/pkg/dev_compiler/lib/src/kernel/compiler.dart
@@ -395,11 +395,11 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
 
   @override
   InterfaceType get privateSymbolType =>
-      _coreTypes.legacyRawType(_privateSymbolClass);
+      _coreTypes.nonNullableRawType(_privateSymbolClass);
 
   @override
   InterfaceType get internalSymbolType =>
-      _coreTypes.legacyRawType(_coreTypes.internalSymbolClass);
+      _coreTypes.nonNullableRawType(_coreTypes.internalSymbolClass);
 
   final FutureOrNormalizer _futureOrNormalizer;
 
@@ -2677,7 +2677,7 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
   void _registerExtensionType(
       Class c, String jsPeerName, List<js_ast.Statement> body) {
     var className = _emitTopLevelName(c);
-    if (_typeRep.isPrimitive(_coreTypes.legacyRawType(c))) {
+    if (_typeRep.isPrimitive(_coreTypes.nonNullableRawType(c))) {
       body.add(runtimeStatement(
           'definePrimitiveHashCode(#.prototype)', [className]));
     }
@@ -2948,7 +2948,7 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
     if (c == null) {
       return _isObjectMember(name);
     }
-    c = _typeRep.getImplementationClass(_coreTypes.legacyRawType(c)) ?? c;
+    c = _typeRep.getImplementationClass(_coreTypes.nonNullableRawType(c)) ?? c;
     if (_extensionTypes.isNativeClass(c)) {
       var member = _lookupForwardedMember(c, name);
 
@@ -5843,7 +5843,7 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
       Expression expr, Member? target, InvocationExpression node) {
     var op = node.name.text;
     if (target != null) {
-      var dispatchType = _coreTypes.legacyRawType(target.enclosingClass!);
+      var dispatchType = _coreTypes.nonNullableRawType(target.enclosingClass!);
       if (_typeRep.unaryOperationIsPrimitive(dispatchType)) {
         if (op == '~') {
           if (_typeRep.isNumber(dispatchType)) {
@@ -6026,11 +6026,11 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
     // https://github.com/dart-lang/sdk/issues/33293
     if (target != null) {
       var targetClass = target.enclosingClass!;
-      var leftType = _coreTypes.legacyRawType(targetClass);
+      var leftType = _coreTypes.nonNullableRawType(targetClass);
       var rightType = right.getStaticType(_staticTypeContext);
 
       if (_typeRep.binaryOperationIsPrimitive(leftType, rightType) ||
-          leftType == _types.coreTypes.stringLegacyRawType && op == '+') {
+          targetClass == _coreTypes.stringClass && op == '+') {
         // Inline operations on primitive types where possible.
         // TODO(jmesserly): inline these from dart:core instead of hardcoding
         // the implementation details here.
@@ -7063,7 +7063,7 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
     var ctorClass = ctor.enclosingClass!;
     if (isJSAnonymousType(ctorClass)) return _emitObjectLiteral(args, ctor);
     return js_ast.New(
-        _emitConstructorName(_coreTypes.legacyRawType(ctorClass), ctor),
+        _emitConstructorName(_coreTypes.nonNullableRawType(ctorClass), ctor),
         _emitArgumentList(args, types: false, target: ctor));
   }
 

diff --git a/pkg/dev_compiler/lib/src/kernel/nullable_inference.dart b/pkg/dev_compiler/lib/src/kernel/nullable_inference.dart
@@ -220,7 +220,7 @@ class NullableInference extends ExpressionVisitor<bool>
       //
       // This allows us to find the `@notNull` annotation if it exists.
       var implClass = jsTypeRep
-          .getImplementationClass(coreTypes.legacyRawType(targetClass));
+          .getImplementationClass(coreTypes.nonNullableRawType(targetClass));
       if (implClass != null) {
         var member =
             jsTypeRep.hierarchy.getDispatchTarget(implClass, target.name);

diff --git a/pkg/vm_service_interface/CHANGELOG.md b/pkg/vm_service_interface/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.0.1
+- Update `package:vm_service` constraint to `>=12.0.0 <15.0.0`.
+
 ## 1.0.0
 - Initial release.
-- Provides version 4.13 of the Dart VM service protocol.
+- Provides version 4.13 of the Dart VM service protocol.
diff --git a/pkg/vm_service_interface/pubspec.yaml b/pkg/vm_service_interface/pubspec.yaml
@@ -1,6 +1,6 @@
 name: vm_service_interface
 
-version: 1.0.0
+version: 1.0.1
 description: >-
   A library providing an interface to implement the Dart VM service protocol.
 
@@ -10,7 +10,7 @@ environment:
   sdk: ^3.0.0
 
 dependencies:
-  vm_service: '>=12.0.0 <14.0.0'
+  vm_service: '>=12.0.0 <15.0.0'
 
 # We use 'any' version constraints here as we get our package versions from
 # the dart-lang/sdk repo's DEPS file. Note that this is a special case; the
@@ -20,4 +20,4 @@ dev_dependencies:
   async: any
   lints: any
   mockito: any
-  test: any
+  test: any
diff --git a/tools/VERSION b/tools/VERSION
@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 3
 PATCH 0
-PRERELEASE 224
+PRERELEASE 225
 PRERELEASE_PATCH 0