Version 2.15.0-51.0.dev

Merge commit '0231a0841a37ab2abfe9c236258f67f9f1bfa4fe' into 'dev'

Author: Dart CI

benchmarks/EventLoopLatencyRegexp/dart2/EventLoopLatencyRegexp.dart

@@ -6,7 +6,7 @@
 
 import 'dart:isolate';
 
-import 'json_benchmark.dart';
+import 'regexp_benchmark.dart';
 import 'latency.dart';
 
 main() async {

pkg/analysis_server/tool/code_completion/completion_metrics.dart

@@ -1071,8 +1071,9 @@ class CompletionMetricsComputer {
           .toList();
       locations.sort();
       for (var location in locations) {
-        table.add(toRow(targetMetrics
-            .map((metrics) => metrics.locationMrrComputers[location]!)));
+        table.add(toRow(targetMetrics.map((metrics) =>
+            metrics.locationMrrComputers[location] ??
+            MeanReciprocalRankComputer(location))));
       }
     }
     rightJustifyColumns(table, range(1, table[0].length));

pkg/analyzer/lib/src/generated/resolver.dart

@@ -1701,9 +1701,9 @@ class ResolverVisitor extends ResolverBase with ErrorDetectionHelpers {
 
     var functionRewrite = MethodInvocationResolver.getRewriteResult(node);
     if (functionRewrite != null) {
-      nullShortingTermination(node, discardType: true);
       _resolveRewrittenFunctionExpressionInvocation(
           functionRewrite, whyNotPromotedList);
+      nullShortingTermination(node, discardType: true);
     } else {
       nullShortingTermination(node);
     }

pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart

@@ -2542,6 +2542,34 @@ void testShort(C? c) {
     );
   }
 
+  test_hasReceiver_interfaceQ_nullShorting_getter() async {
+    await assertNoErrorsInCode(r'''
+abstract class C {
+  void Function(C) get foo;
+}
+
+void f(C? c) {
+  c?.foo(c); // 1
+}
+''');
+
+    var invocation = findNode.functionExpressionInvocation('foo(c);');
+    assertElementNull(invocation);
+    assertInvokeType(invocation, 'void Function(C)');
+    assertType(invocation, 'void');
+
+    var foo = invocation.function as PropertyAccess;
+    assertType(foo, 'void Function(C)');
+    assertElement(foo.propertyName, findElement.getter('foo'));
+    assertType(foo.propertyName, 'void Function(C)');
+
+    assertSimpleIdentifier(
+      findNode.simple('c); // 1'),
+      element: findElement.parameter('c'),
+      type: 'C',
+    );
+  }
+
   test_hasReceiver_interfaceTypeQ_defined() async {
     await assertErrorsInCode(r'''
 class A {

pkg/vm_snapshot_analysis/test/utils.dart

@@ -10,7 +10,7 @@ import 'package:test/test.dart';
 
 final dartCompile = () {
   final sdkBin = path.dirname(Platform.executable);
-  final dartCmd = path.join(sdkBin, Platform.isWindows ? 'dart.bat' : 'dart');
+  final dartCmd = path.join(sdkBin, Platform.isWindows ? 'dart.exe' : 'dart');
 
   if (!File(dartCmd).existsSync()) {
     throw 'Failed to locate `dart` in the SDK';

runtime/observatory/tests/service/regress_46419_test.dart

@@ -0,0 +1,75 @@
+// Copyright (c) 2021, the Dart project authors.  Please see the AUTHORS file
+// 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.
+// VMOptions=--verbose-debug
+
+import 'package:observatory/service_io.dart';
+import 'package:test/test.dart';
+import 'service_test_common.dart';
+import 'test_helper.dart';
+
+// DO NOT REORDER BEYOND THIS POINT
+bool testing = false;
+void printSync() {
+  print('sync');
+  if (testing) {
+    // We'll never reach this code, but setting a breakpoint here will result in
+    // the breakpoint being resolved below at line 25.
+    print('unreachable'); // line 18, bp1
+  }
+}
+
+printSyncStar() sync* {
+  // We'll end up resolving breakpoint 1 to this location instead of at line 15
+  // if #46419 regresses.
+  print('sync*');
+}
+
+testeeDo() {
+  printSync();
+  final iterator = printSyncStar();
+
+  print('middle'); // Line 32, bp2
+
+  iterator.toList();
+}
+// END DO NOT REORDER SECTION
+
+late Breakpoint bp1;
+late Breakpoint bp2;
+
+final tests = <IsolateTest>[
+  hasPausedAtStart,
+  (Isolate isolate) async {
+    await isolate.rootLibrary.load();
+    final script = isolate.rootLibrary.scripts[0];
+
+    bp1 = await isolate.addBreakpoint(script, 18);
+    print("BP1 - $bp1");
+    expect(bp1, isNotNull);
+    expect(bp1 is Breakpoint, isTrue);
+    bp2 = await isolate.addBreakpoint(script, 32);
+    print("BP2 - $bp2");
+    expect(bp2, isNotNull);
+  },
+  resumeIsolate,
+  (Isolate isolate) async {
+    final stream = await isolate.vm.getEventStream(VM.kDebugStream);
+    await for (ServiceEvent event in stream) {
+      if (event.kind == ServiceEvent.kPauseBreakpoint) {
+        var bp = event.breakpoint;
+        print('Hit $bp');
+        expect(bp, bp2);
+        await isolate.resume();
+        break;
+      }
+    }
+  }
+];
+
+void main([args = const []]) => runIsolateTests(
+      args,
+      tests,
+      testeeConcurrent: testeeDo,
+      pause_on_start: true,
+    );

runtime/observatory/tests/service/service_kernel.status

@@ -163,6 +163,7 @@ positive_token_pos_test: SkipByDesign # Debugger is disabled in AOT mode.
 regress_28443_test: SkipByDesign # Debugger is disabled in AOT mode.
 regress_28980_test: SkipByDesign # Debugger is disabled in AOT mode.
 regress_34841_test: SkipByDesign # Debugger is disabled in AOT mode.
+regress_46419_test: SkipByDesign # Debugger is disabled in AOT mode.
 reload_sources_test: SkipByDesign # Hot reload is disabled in AOT mode.
 rewind_optimized_out_test: SkipByDesign # Debugger is disabled in AOT mode.
 rewind_test: SkipByDesign # Debugger is disabled in AOT mode.

runtime/observatory_2/tests/service_2/regress_46419_test.dart

@@ -0,0 +1,75 @@
+// Copyright (c) 2021, the Dart project authors.  Please see the AUTHORS file
+// 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.
+// VMOptions=--verbose-debug
+
+import 'package:observatory_2/service_io.dart';
+import 'package:test/test.dart';
+import 'service_test_common.dart';
+import 'test_helper.dart';
+
+// DO NOT REORDER BEYOND THIS POINT
+bool testing = false;
+void printSync() {
+  print('sync');
+  if (testing) {
+    // We'll never reach this code, but setting a breakpoint here will result in
+    // the breakpoint being resolved below at line 25.
+    print('unreachable'); // line 18, bp1
+  }
+}
+
+printSyncStar() sync* {
+  // We'll end up resolving breakpoint 1 to this location instead of at line 15
+  // if #46419 regresses.
+  print('sync*');
+}
+
+testeeDo() {
+  printSync();
+  final iterator = printSyncStar();
+
+  print('middle'); // Line 32, bp2
+
+  iterator.toList();
+}
+// END DO NOT REORDER SECTION
+
+Breakpoint bp1;
+Breakpoint bp2;
+
+final tests = <IsolateTest>[
+  hasPausedAtStart,
+  (Isolate isolate) async {
+    await isolate.rootLibrary.load();
+    final script = isolate.rootLibrary.scripts[0];
+
+    bp1 = await isolate.addBreakpoint(script, 18);
+    print("BP1 - $bp1");
+    expect(bp1, isNotNull);
+    expect(bp1 is Breakpoint, isTrue);
+    bp2 = await isolate.addBreakpoint(script, 32);
+    print("BP2 - $bp2");
+    expect(bp2, isNotNull);
+  },
+  resumeIsolate,
+  (Isolate isolate) async {
+    final stream = await isolate.vm.getEventStream(VM.kDebugStream);
+    await for (ServiceEvent event in stream) {
+      if (event.kind == ServiceEvent.kPauseBreakpoint) {
+        var bp = event.breakpoint;
+        print('Hit $bp');
+        expect(bp, bp2);
+        await isolate.resume();
+        break;
+      }
+    }
+  }
+];
+
+void main([args = const []]) => runIsolateTests(
+      args,
+      tests,
+      testeeConcurrent: testeeDo,
+      pause_on_start: true,
+    );

runtime/observatory_2/tests/service_2/service_2_kernel.status

@@ -163,6 +163,7 @@ positive_token_pos_test: SkipByDesign # Debugger is disabled in AOT mode.
 regress_28443_test: SkipByDesign # Debugger is disabled in AOT mode.
 regress_28980_test: SkipByDesign # Debugger is disabled in AOT mode.
 regress_34841_test: SkipByDesign # Debugger is disabled in AOT mode.
+regress_46419_test: SkipByDesign # Debugger is disabled in AOT mode.
 reload_sources_test: SkipByDesign # Hot reload is disabled in AOT mode.
 rewind_optimized_out_test: SkipByDesign # Debugger is disabled in AOT mode.
 rewind_test: SkipByDesign # Debugger is disabled in AOT mode.

runtime/vm/class_finalizer.cc

@@ -1381,6 +1381,7 @@ void ClassFinalizer::VerifyImplicitFieldOffsets() {
 
 void ClassFinalizer::SortClasses() {
   auto T = Thread::Current();
+  StackZone stack_zone(T);
   auto Z = T->zone();
   auto IG = T->isolate_group();