Version 2.19.0-326.0.dev

Merge 8c0df46 into dev

Author: Dart CI

DEPS

@@ -94,7 +94,7 @@ vars = {
 
   "args_rev": "80d4abbd6b38b79bcdbc411b4b517628c7611232",
   "async_rev": "f3ed5f690e2ec9dbe1bfc5184705575b4f6480e5",
-  "bazel_worker_rev": "75a947fad63925fb441932af651819132b5ca450",
+  "bazel_worker_rev": "03717ca4c2bbf1d74f26c89673426e076288242a",
   "benchmark_harness_rev": "6a116758f2b96e92659194bcda990f42106a01d3",
   "boolean_selector_rev": "1d3565e2651d16566bb556955b96ea75018cbd0c",
   "boringssl_gen_rev": "ced85ef0a00bbca77ce5a91261a5f2ae61b1e62f",
@@ -128,7 +128,7 @@ vars = {
   "file_rev": "b2e31cb6ef40b223701dbfa0b907fe58468484d7",
   "fixnum_rev": "e0b17cc1f639c55a9c24947392c64b5a68992535",
   "glob_rev": "ee812790f4d98587a363e65d5af484ed9c6943f8",
-  "html_rev": "0740fc737350959cfdb5f8a34425a29d0dc0d285",
+  "html_rev": "0bf601959ac98e6cdf1925a1cdab70bd6a5ddc45",
   "http_multi_server_rev": "20bf079c8955d1250a45afb9cb096472a724a551",
   "http_parser_rev": "c73967535ce31120e218120f70ef98cc22688c82",
   "http_rev": "738a55b20e391c5a526b86bf4b02af6b7745b494",
@@ -139,7 +139,7 @@ vars = {
   "linter_rev": "f2c55484e8ebda0aec8c2fea637b3bd5b17258ca", # 1.28.0
   "lints_rev": "8294e5648ab49474541527e2911e72e4c5aefe55",
   "logging_rev": "f322480fb9d9e83e677c08db6d09067059f7ff74",
-  "markdown_rev": "d72ae07c8290b3780044170eda28eda5a9fb342e", # b/254513467
+  "markdown_rev": "93d0eee771f6355be6737c2a865f613f6b105bf1",
   "markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783",
   "matcher_rev": "6a9b83bbd73e50df2058b3e8e4aa301df49569c6",
   "mime_rev": "bf041aa372a27aae6f94e185aa0af3932b9de98b",
@@ -155,7 +155,7 @@ vars = {
   "root_certificates_rev": "692f6d6488af68e0121317a9c2c9eb393eb0ee50",
   "shelf_rev": "39d820d4e32fc99c65f562786097487d597dcee1",
   "source_map_stack_trace_rev": "8d8078fcc81c8f7936805cd277198493e0b7fc62",
-  "source_maps_rev": "c7e89635a7651974feb78e3ce272fac5aa3f4334",
+  "source_maps_rev": "b031e2cdbef5675ab9a92025202d323a5e7cc526",
   "source_span_rev": "ff03af16474ce91c89eb3bc28182866f4cb6dfb0",
   "sse_rev": "283568dd4865cc51e25370ed107fcbdb68759c22",
   "stack_trace_rev": "dce00134f6558086e8963e37d0b1ba0830862c01",
@@ -174,7 +174,7 @@ vars = {
   "web_components_rev": "8f57dac273412a7172c8ade6f361b407e2e4ed02",
   "web_socket_channel_rev": "4b46c0c4196a5e76c2b0e2589ed37de247d35938",
   "WebCore_rev": "bcb10901266c884e7b3740abc597ab95373ab55c",
-  "webdev_rev": "5343edbab54ecee37af9d18062847614b91a4bd6",
+  "webdev_rev": "a02f073aecb4c4e7befdf4c1fcc4c83e67af8bf2",
   "webdriver_rev": "f56cc6a2f9612a0a13fec4282dc61b90df384033",
   "webkit_inspection_protocol_rev": "b825c8f6a12200d619729903207ac826cce278da",
   "yaml_edit_rev": "01589b3ce447b03aed991db49f1ec6445ad5476d",

pkg/analysis_server/lib/src/services/correction/dart/remove_dead_code.dart

@@ -74,6 +74,9 @@ class RemoveDeadCode extends CorrectionProducer {
         });
       }
     } else if (coveredNode is Statement) {
+      if (coveredNode is EmptyStatement) {
+        return;
+      }
       if (coveredNode is DoStatement &&
           await _computeDoStatement(builder, coveredNode)) {
         return;

pkg/analysis_server/test/src/services/correction/fix/remove_dead_code_test.dart

@@ -185,6 +185,15 @@ void f(bool c) {
 ''', errorFilter: (err) => err.problemMessage.length == 10);
   }
 
+  Future<void> test_emptyStatement() async {
+    await resolveTestCode('''
+void f() {
+  for (var i = 0; false; i++);
+}
+''');
+    await assertNoFix();
+  }
+
   @failingTest
   Future<void> test_for_returnInBody() async {
     // https://github.com/dart-lang/sdk/issues/43511

pkg/analysis_server_client/pubspec.yaml

@@ -19,7 +19,5 @@ dependencies:
 # See also https://dart.dev/tools/pub/dependencies.
 dev_dependencies:
   analyzer: any
-  analysis_server: any
-  analyzer_utilities: any
   lints: any
   test: any

pkg/analysis_server_client/test/verify_sorted_test.dart

@@ -2,75 +2,122 @@
 // 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.
 
-import 'package:analysis_server/src/services/correction/sort_members.dart';
-import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
-import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/dart/analysis/session.dart';
+import 'dart:async';
+import 'dart:io';
+
+import 'package:analysis_server_client/handler/connection_handler.dart';
+import 'package:analysis_server_client/handler/notification_handler.dart';
+import 'package:analysis_server_client/protocol.dart';
+import 'package:analysis_server_client/server.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
-import 'package:analyzer_utilities/package_root.dart';
+import 'package:path/path.dart' as pathos;
 import 'package:test/test.dart';
 
-void main() {
+void main() async {
   var provider = PhysicalResourceProvider.INSTANCE;
   var normalizedRoot = provider.pathContext.normalize(packageRoot);
   var packagePath =
       provider.pathContext.join(normalizedRoot, 'analysis_server_client');
-  // TODO(brianwilkerson) Fix the generator to sort the generated files and
-  //  remove these exclusions.
-  var generatedFilePaths = [
-    provider.pathContext
-        .join(packagePath, 'lib', 'src', 'protocol', 'protocol_common.dart'),
-    provider.pathContext
-        .join(packagePath, 'lib', 'src', 'protocol', 'protocol_constants.dart'),
-    provider.pathContext
-        .join(packagePath, 'lib', 'src', 'protocol', 'protocol_generated.dart'),
-  ];
-
-  var collection = AnalysisContextCollection(
-      includedPaths: <String>[packagePath],
-      excludedPaths: generatedFilePaths,
-      resourceProvider: provider);
-  var contexts = collection.contexts;
-  if (contexts.length != 1) {
-    fail('The directory $packagePath contains multiple analysis contexts.');
+
+  group('validate member sort order', () {
+    late Server server;
+
+    setUpAll(() async {
+      server = await connectToServer(packagePath);
+    });
+
+    tearDownAll(() async {
+      await server.stop();
+    });
+
+    // define tests
+    for (var file in listPackageDartFiles(provider.getFolder(packagePath))) {
+      var relativePath =
+          provider.pathContext.relative(file.path, from: packagePath);
+
+      test(relativePath, () async {
+        var response = await server.send(EDIT_REQUEST_SORT_MEMBERS,
+            EditSortMembersParams(file.path).toJson());
+        var result = EditSortMembersResult.fromJson(
+            ResponseDecoder(null), 'result', response);
+
+        expect(result.edit.edits, isEmpty);
+      });
+    }
+  });
+}
+
+/// Returns a path to the pkg directory.
+String get packageRoot {
+  var scriptPath = pathos.fromUri(Platform.script);
+  var parts = pathos.split(scriptPath);
+  var pkgIndex = parts.indexOf('pkg');
+  return pathos.joinAll(parts.sublist(0, pkgIndex + 1)) + pathos.separator;
+}
+
+Future<Server> connectToServer(String packagePath) async {
+  // start the server
+  var server = Server();
+  await server.start();
+
+  // connect to the server
+  var handler = StatusHandler(server);
+  server.listenToOutput(notificationProcessor: handler.handleEvent);
+  if (!await handler.serverConnected(timeLimit: const Duration(seconds: 15))) {
+    stderr.writeln('server failed to start');
+    exit(1);
   }
 
-  buildTestsIn(contexts[0].currentSession, packagePath, generatedFilePaths,
-      provider.getFolder(packagePath));
+  // start analysis
+  await server.send(SERVER_REQUEST_SET_SUBSCRIPTIONS,
+      ServerSetSubscriptionsParams([ServerService.STATUS]).toJson());
+  await server.send(ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS,
+      AnalysisSetAnalysisRootsParams([packagePath], const []).toJson());
+
+  // wait for analysis to complete
+  await handler.analysisFinshed.future;
+
+  return server;
 }
 
-void buildTestsIn(AnalysisSession session, String testDirPath,
-    List<String> generatedFilePaths, Folder directory) {
-  var pathContext = session.resourceProvider.pathContext;
-  var children = directory.getChildren();
-  children.sort((first, second) => first.shortName.compareTo(second.shortName));
+Iterable<File> listPackageDartFiles(Folder folder) sync* {
+  // TODO(brianwilkerson) Fix the generator to sort the generated files and
+  // remove these exclusions.
+  const exclusions = <String>{
+    'protocol_common.dart',
+    'protocol_constants.dart',
+    'protocol_generated.dart',
+  };
+
+  var children = folder.getChildren()
+    ..sort((a, b) => a.shortName.compareTo(b.shortName));
+
   for (var child in children) {
-    if (child is Folder) {
-      buildTestsIn(session, testDirPath, generatedFilePaths, child);
-    } else if (child is File && child.shortName.endsWith('.dart')) {
-      var path = child.path;
-      if (generatedFilePaths.contains(path)) {
-        continue;
+    if (child is File && child.shortName.endsWith('.dart')) {
+      if (!exclusions.contains(child.shortName)) {
+        yield child;
+      }
+    } else if (child is Folder) {
+      yield* listPackageDartFiles(child);
+    }
+  }
+}
+
+class StatusHandler with NotificationHandler, ConnectionHandler {
+  @override
+  final Server server;
+
+  final Completer<bool> analysisFinshed = Completer();
+
+  StatusHandler(this.server);
+
+  @override
+  void onServerStatus(ServerStatusParams params) {
+    if (params.analysis != null) {
+      if (!params.analysis!.isAnalyzing) {
+        analysisFinshed.complete(true);
       }
-      var relativePath = pathContext.relative(path, from: testDirPath);
-      test(relativePath, () async {
-        var result = session.getParsedUnit(path);
-        if (result is! ParsedUnitResult) {
-          fail('Could not parse $path');
-        }
-        var code = result.content;
-        var unit = result.unit;
-        var errors = result.errors;
-        if (errors.isNotEmpty) {
-          fail('Errors found when parsing $path');
-        }
-        var sorter = MemberSorter(code, unit, result.lineInfo);
-        var edits = sorter.sort();
-        if (edits.isNotEmpty) {
-          fail('Unsorted file $path');
-        }
-      });
     }
   }
 }

runtime/lib/double.cc

@@ -2,6 +2,8 @@
 // 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.
 
+#include "lib/integers.h"
+
 #include "vm/bootstrap_natives.h"
 
 #include <math.h>  // NOLINT
@@ -76,7 +78,7 @@ DEFINE_NATIVE_ENTRY(Double_hashCode, 0, 1) {
       (val <= kMaxInt64RepresentableAsDouble)) {
     int64_t ival = static_cast<int64_t>(val);
     if (static_cast<double>(ival) == val) {
-      return Integer::New(ival);
+      return Integer::New(Multiply64Hash(ival));
     }
   }
 

runtime/lib/integers.cc

@@ -2,6 +2,7 @@
 // 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.
 
+#include "lib/integers.h"
 #include "vm/bootstrap_natives.h"
 
 #include "include/dart_api.h"
@@ -271,6 +272,37 @@ DEFINE_NATIVE_ENTRY(Smi_bitLength, 0, 1) {
   return Smi::New(result);
 }
 
+// Should be kept in sync with
+//  - il_(x64/arm64/...).cc HashIntegerOpInstr,
+//  - asm_intrinsifier(...).cc Multiply64Hash
+uint32_t Multiply64Hash(int64_t ivalue) {
+  const uint64_t magic_constant = /*0x1b873593cc9e*/ 0x2d51;
+  uint64_t value = static_cast<uint64_t>(ivalue);
+#if defined(ARCH_IS_64_BIT)
+#ifdef _MSC_VER
+  __int64 hi = __umulh(value, magic_constant);
+  uint64_t lo = value * magic_constant;
+  uint64_t hash = lo ^ hi;
+#else
+  const __int128 res = static_cast<__int128>(value) * magic_constant;
+  uint64_t hash = res ^ static_cast<int64_t>(res >> 64);
+#endif
+  hash = hash ^ (hash >> 32);
+#else
+  uint64_t prod_lo64 = value * magic_constant;
+
+  uint64_t value_lo32 = value & 0xffffffff;
+  uint64_t value_hi32 = value >> 32;
+  uint64_t carry = (((value_hi32 * magic_constant) & 0xffffffff) +
+                    ((value_lo32 * magic_constant) >> 32)) >>
+                   32;
+  uint64_t prod_hi64 = ((value_hi32 * magic_constant) >> 32) + carry;
+  uint64_t hash = prod_hi64 ^ prod_lo64;
+  hash = hash ^ (hash >> 32);
+#endif
+  return hash & 0x3fffffff;
+}
+
 // Mint natives.
 
 DEFINE_NATIVE_ENTRY(Mint_bitNegate, 0, 1) {

runtime/lib/integers.h

@@ -0,0 +1,16 @@
+// Copyright (c) 2022, 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.
+
+#ifndef RUNTIME_LIB_INTEGERS_H_
+#define RUNTIME_LIB_INTEGERS_H_
+
+#include "platform/globals.h"
+
+namespace dart {
+
+uint32_t Multiply64Hash(int64_t value);
+
+}  // namespace dart
+
+#endif  // RUNTIME_LIB_INTEGERS_H_

runtime/tests/vm/dart/generic_field_invocation_test.dart

@@ -16,5 +16,5 @@ class C {
 main() {
   var c = C();
   c.field = <T>(T x) => x.hashCode;
-  Expect.equals(3, c.field<dynamic>(3));
+  Expect.equals(3.hashCode, c.field<dynamic>(3));
 }

runtime/tests/vm/dart/hashcode_int_values_test.dart

@@ -0,0 +1,33 @@
+// Copyright (c) 2022, 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=--intrinsify
+// VMOptions=--no_intrinsify
+
+import 'package:expect/expect.dart';
+
+main() {
+  // We do not guarantee any particular hash function for integers,
+  // but our implementation relies on the hash function being the same
+  // across architectures.
+  <int, int>{
+    0: 0x0,
+    -0: 0x0,
+    1: 0x2d51,
+    -1: 0x0,
+    0xffff: 0x2d50d2af,
+    -0xffff: 0x2d50fffe,
+    0xffffffff: 0x3fffffff,
+    -0xffffffff: 0x3fffd2ae,
+    0x111111111111: 0x25630507,
+    -0x111111111111: 0x25632856,
+    0xffffffffffff: 0x12af2d50,
+    -0xffffffffffff: 0x12af0001,
+    9007199254840856: 0x2f2da59d,
+    144115188075954880: 0x26761e9a,
+    936748722493162112: 0x196ac8cd,
+  }.forEach((value, expected) {
+    Expect.equals(expected, value.hashCode, "${value}.hashCode");
+  });
+}