Version 3.8.0-7.0.dev

Merge 4dba853 into dev
dart-lang · Jan 17, 2025 · 8b824d7 · 8b824d7
2 parents 3ab2e35 + 4dba853
commit 8b824d7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/DEPS b/DEPS
@@ -141,7 +141,7 @@ vars = {
   "markdown_rev": "19aaded4300d24bedcbf52ade792b203ddf030b0",
   "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
   # dart-native-interop-team@ is rolling breaking changes manually while the assets features are in experimental.
-  "native_rev": "f179ec2693179e48ff1fce827914fd1711c1a941", # disable tools/rev_sdk_deps.dart
+  "native_rev": "ba34674d97ffe612a3df782e1695dab4e5010e66", # disable tools/rev_sdk_deps.dart
   "protobuf_rev": "b7dd58cdbd879beee4c3fbf8ee80fce8e97bad26",
   "pub_rev": "58de642dc1d07601f6eb2b4ecd94555c0210106b", # disable tools/rev_sdk_deps.dart
   "shelf_rev": "bf799519cda2898a7c5af06dcfdd5fe6443afd79",

diff --git a/pkg/_fe_analyzer_shared/lib/src/types/shared_type.dart b/pkg/_fe_analyzer_shared/lib/src/types/shared_type.dart
@@ -193,8 +193,10 @@ extension type SharedRecordTypeView<
 }
 
 extension type SharedTypeSchemaView<
-        TypeStructure extends SharedTypeStructure<TypeStructure>>(
+        TypeStructure extends SharedTypeStructure<TypeStructure>>._(
     SharedTypeStructure<TypeStructure> _typeStructure) implements Object {
+  SharedTypeSchemaView(TypeStructure typeStructure) : this._(typeStructure);
+
   NullabilitySuffix get nullabilitySuffix => _typeStructure.nullabilitySuffix;
 
   String getDisplayString() => _typeStructure.getDisplayString();
@@ -203,8 +205,10 @@ extension type SharedTypeSchemaView<
 }
 
 extension type SharedTypeView<
-        TypeStructure extends SharedTypeStructure<TypeStructure>>(
+        TypeStructure extends SharedTypeStructure<TypeStructure>>._(
     SharedTypeStructure<TypeStructure> _typeStructure) implements Object {
+  SharedTypeView(TypeStructure typeStructure) : this._(typeStructure);
+
   NullabilitySuffix get nullabilitySuffix => _typeStructure.nullabilitySuffix;
 
   String getDisplayString() => _typeStructure.getDisplayString();
@@ -248,8 +252,7 @@ extension type SharedVoidTypeView<
 /// [SharedTypeStructureExtension] as follows:
 ///     return e.foo()?.wrapSharedTypeView();
 extension SharedTypeStructureExtension<
-        TypeStructure extends SharedTypeStructure<TypeStructure>>
-    on SharedTypeStructure<TypeStructure> {
+    TypeStructure extends SharedTypeStructure<TypeStructure>> on TypeStructure {
   SharedTypeSchemaView<TypeStructure> wrapSharedTypeSchemaView() {
     return new SharedTypeSchemaView(this);
   }
@@ -261,8 +264,8 @@ extension SharedTypeStructureExtension<
 
 extension SharedTypeStructureMapEntryExtension<
     TypeStructure extends SharedTypeStructure<TypeStructure>> on ({
-  SharedTypeStructure<TypeStructure> keyType,
-  SharedTypeStructure<TypeStructure> valueType
+  TypeStructure keyType,
+  TypeStructure valueType
 }) {
   ({
     SharedTypeView<TypeStructure> keyType,

diff --git a/runtime/vm/compiler/backend/inliner.cc b/runtime/vm/compiler/backend/inliner.cc
@@ -190,7 +190,7 @@ class GraphInfoCollector : public ValueObject {
           instruction_count_ += current->ArgumentCount();
         }
         if (current->IsInstanceCall() || current->IsStaticCall() ||
-            current->IsClosureCall()) {
+            current->IsClosureCall() || current->IsDispatchTableCall()) {
           ++call_site_count_;
           continue;
         }

diff --git a/tools/VERSION b/tools/VERSION
@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 8
 PATCH 0
-PRERELEASE 6
+PRERELEASE 7
 PRERELEASE_PATCH 0