Version 3.9.0-225.0.dev

Merge 9202990 into dev

Author: Dart CI

pkg/front_end/test/flutter_gallery_leak_tester.dart

@@ -59,21 +59,13 @@ Future<void> main(List<String> args) async {
     throw "File not found: $frontendServerStarter";
   }
 
-  Directory gallery = new Directory("$rootPath/gallery");
-  if (!gallery.existsSync()) {
-    print("Gallery not found... Copying from flutter dir.");
-
-    Directory galleryFlutterDev =
-        new Directory("$rootPath/flutter/dev/integration_tests/new_gallery");
-
-    // Copy it.
-    Process process = await Process.start(
-        "cp", ["-r", galleryFlutterDev.path, "$rootPath/gallery"]);
-    int processExitCode = await process.exitCode;
-    print("Exit code from cp: $processExitCode");
+  File packageConfig =
+      new File("$rootPath/flutter/.dart_tool/package_config.json");
 
-    process = await Process.start("../flutter/bin/flutter", ["pub", "get"],
-        workingDirectory: "$rootPath/gallery/");
+  if (!packageConfig.existsSync()) {
+    // If the package_config doesn't exist we should run pub get.
+    Process process = await Process.start("bin/flutter", ["pub", "get"],
+        workingDirectory: "$rootPath/flutter/");
     process.stdout
         .transform(utf8.decoder)
         .transform(new LineSplitter())
@@ -86,59 +78,12 @@ Future<void> main(List<String> args) async {
         .listen((line) {
       print("flutter stderr> $line");
     });
-    processExitCode = await process.exitCode;
+    int processExitCode = await process.exitCode;
     print("Exit code from flutter: $processExitCode");
-
-    // Attempt to hack around strings being truncated to 128 bytes in heap dumps
-    // https://github.com/dart-lang/sdk/blob/c59cdee365b94ce066344840f9e3412d642019b5/runtime/vm/object_graph.cc#L809
-    // (pub paths can become too long, so two distinct files will look to have
-    // the same url and thus give a false positive).
-    Uri pubDirUri = Uri.parse("file://${Platform.environment['HOME']}/"
-        ".pub-cache/hosted/pub.dev/");
-    Directory pubDir = new Directory.fromUri(pubDirUri);
-    if (!pubDir.existsSync()) {
-      File galleryPackageConfig =
-          new File("$rootPath/gallery/.dart_tool/package_config.json");
-      String? packagesData;
-      if (galleryPackageConfig.existsSync()) {
-        packagesData = galleryPackageConfig.readAsStringSync();
-      }
-
-      throw "Expected to find $pubDir but didn't.\n"
-          "Content of packages file (${packagesData.runtimeType}): "
-          "$packagesData";
-    }
-
-    File galleryPackageConfig =
-        new File("$rootPath/gallery/.dart_tool/package_config.json");
-    if (!galleryPackageConfig.existsSync()) {
-      throw "Didn't find $galleryPackageConfig";
-    }
-    String data = galleryPackageConfig.readAsStringSync();
-    data = data.replaceAll(pubDirUri.toString(), "../pub/");
-    galleryPackageConfig.writeAsStringSync(data);
-
-    process = await Process.start("ln", ["-s", pubDir.path, "pub"],
-        workingDirectory: "$rootPath/gallery/");
-    process.stdout
-        .transform(utf8.decoder)
-        .transform(new LineSplitter())
-        .listen((line) {
-      print("ln stdout> $line");
-    });
-    process.stderr
-        .transform(utf8.decoder)
-        .transform(new LineSplitter())
-        .listen((line) {
-      print("ln stderr> $line");
-    });
-    processExitCode = await process.exitCode;
-    print("Exit code from ln: $processExitCode");
   }
 
-  File packageConfig =
-      new File("$rootPath/gallery/.dart_tool/package_config.json");
   if (!packageConfig.existsSync()) {
+    // If it still doesn't exist something is wrong.
     throw "Didn't find $packageConfig";
   }
 
@@ -179,7 +124,7 @@ Future<void> main(List<String> args) async {
     "--output-dill",
     "$rootPath/flutter_server_tmp.dill",
     "--packages",
-    "$rootPath/gallery/.dart_tool/package_config.json",
+    packageConfig.path,
     "-Ddart.vm.profile=false",
     "-Ddart.vm.product=false",
     "--enable-asserts",

pkg/kernel/lib/dart_scope_calculator.dart

@@ -160,7 +160,9 @@ class DartScopeBuilder extends VisitorDefault<void> with VisitorVoidMixin {
     //
     // A null name signals that the variable was synthetically introduced by the
     // compiler so they are skipped.
-    if ((decl.fileOffset < 0 || decl.fileOffset < _offset) && name != null) {
+    if ((decl.fileOffset < 0 || decl.fileOffset < _offset) &&
+        !decl.isWildcard &&
+        name != null) {
       _definitions[name] = decl.type;
     }
     super.visitVariableDeclaration(decl);
@@ -262,7 +264,7 @@ class DartScopeBuilder2 extends VisitorDefault<void> with VisitorVoidMixin {
   final Uri _scriptUri;
   final int _offset;
   final List<DartScope2> findScopes = [];
-  final Set<int> foundOffsets = {};
+  int? closestLessOrEqualFoundOffset;
 
   final Set<VariableDeclaration> hoistedUnwritten = {};
   final List<List<VariableDeclaration>> scopes = [];
@@ -289,7 +291,8 @@ class DartScopeBuilder2 extends VisitorDefault<void> with VisitorVoidMixin {
         String? name = decl.name;
         if (name != null &&
             !decl.isSynthesized &&
-            !hoistedUnwritten.contains(decl)) {
+            !hoistedUnwritten.contains(decl) &&
+            !decl.isWildcard) {
           definitions[name] = decl;
         }
       }
@@ -529,20 +532,32 @@ class DartScopeBuilder2 extends VisitorDefault<void> with VisitorVoidMixin {
     scopes.last.add(node);
   }
 
+  void _updateClosestFoundOffset(int offset) {
+    if (offset > _offset) {
+      // This offset is larger that the one we're looking for so we'll skip.
+      return;
+    }
+    if (closestLessOrEqualFoundOffset == null ||
+        offset > closestLessOrEqualFoundOffset!) {
+      closestLessOrEqualFoundOffset = offset;
+      return;
+    }
+  }
+
   void _checkOffset(TreeNode node) {
-    if (_currentUri == _scriptUri) {
-      foundOffsets.add(node.fileOffset);
-      if (node.fileOffset == _offset) {
-        addFound(node);
-      } else {
-        List<int>? allOffsets = node.fileOffsetsIfMultiple;
-        if (allOffsets != null) {
-          for (final int offset in allOffsets) {
-            foundOffsets.add(offset);
-            if (offset == _offset) {
-              addFound(node);
-              break;
-            }
+    if (_currentUri != _scriptUri) return;
+
+    _updateClosestFoundOffset(node.fileOffset);
+    if (node.fileOffset == _offset) {
+      addFound(node);
+    } else {
+      List<int>? allOffsets = node.fileOffsetsIfMultiple;
+      if (allOffsets != null) {
+        for (final int offset in allOffsets) {
+          _updateClosestFoundOffset(offset);
+          if (offset == _offset) {
+            addFound(node);
+            break;
           }
         }
       }
@@ -553,36 +568,15 @@ class DartScopeBuilder2 extends VisitorDefault<void> with VisitorVoidMixin {
       Library library, Uri scriptUri, Class? cls, int offset) {
     DartScopeBuilder2 data = _raw(library, scriptUri, cls, offset);
     if (data.findScopes.isEmpty) {
-      int? closestMatchingOrSmallerOffset =
-          _findClosestMatchingOrSmallerOffset(data, offset);
-      if (closestMatchingOrSmallerOffset != null) {
-        offset = closestMatchingOrSmallerOffset;
+      int? closestLessOrEqualFoundOffset = data.closestLessOrEqualFoundOffset;
+      if (closestLessOrEqualFoundOffset != null) {
+        offset = closestLessOrEqualFoundOffset;
         data = _raw(library, scriptUri, cls, offset);
       }
     }
     return _findScopePick(data.findScopes, library, cls, offset);
   }
 
-  static int? _findClosestMatchingOrSmallerOffset(
-      DartScopeBuilder2 data, int offset) {
-    List<int> foundOffsets = data.foundOffsets.toList()..sort();
-    if (foundOffsets.isEmpty) return null;
-    int low = 0;
-    int high = foundOffsets.length - 1;
-    while (low < high) {
-      int mid = high - ((high - low) >> 1); // Get middle, rounding up.
-      int pivot = foundOffsets[mid];
-      if (pivot <= offset) {
-        low = mid;
-      } else {
-        high = mid - 1;
-      }
-    }
-    int result = foundOffsets[low];
-    if (result < 0) return null;
-    return result;
-  }
-
   static DartScope _findScopePick(
       List<DartScope2> scopes, Library library, Class? cls, int offset) {
     DartScope2 scope;
@@ -619,10 +613,9 @@ class DartScopeBuilder2 extends VisitorDefault<void> with VisitorVoidMixin {
       Library library, Uri scriptUri, int offset) {
     DartScopeBuilder2 data = _rawNoClass(library, scriptUri, offset);
     if (data.findScopes.isEmpty) {
-      int? closestMatchingOrSmallerOffset =
-          _findClosestMatchingOrSmallerOffset(data, offset);
-      if (closestMatchingOrSmallerOffset != null) {
-        offset = closestMatchingOrSmallerOffset;
+      int? closestLessOrEqualFoundOffset = data.closestLessOrEqualFoundOffset;
+      if (closestLessOrEqualFoundOffset != null) {
+        offset = closestLessOrEqualFoundOffset;
         data = _rawNoClass(library, scriptUri, offset);
       }
     }

pkg/kernel/test/dart_scope_calculator_test.dart

@@ -360,6 +360,9 @@ class ScopeTestingBinaryPrinter extends BinaryPrinter {
           if (variable.isHoisted && !setVariables.contains(variable)) {
             // A hoisted variable that isn't set (yet) --- pretend it isn't
             // there.
+          } else if (variable.isWildcard) {
+            // A wildcard variable doesn't really exist so we'll ignore it,
+            // see https://github.com/dart-lang/sdk/issues/60841.
           } else {
             expectedVariablesMap[name] = variable.type;
           }

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 9
 PATCH 0
-PRERELEASE 224
+PRERELEASE 225
 PRERELEASE_PATCH 0