Version 3.4.0-166.0.dev

Merge b6aa297 into dev
dart-lang · Feb 22, 2024 · 561cbc6 · 561cbc6
2 parents cb82075 + b6aa297
commit 561cbc6
Show file tree

Hide file tree

Showing 24 changed files with 129 additions and 131 deletions.
diff --git a/DEPS b/DEPS
@@ -57,7 +57,7 @@ vars = {
   "co19_rev": "867d139b3169fc131488e893ec1133dc98cc3aa0",
 
   # The internal benchmarks to use. See go/dart-benchmarks-internal
-  "benchmarks_internal_rev": "3e58fcfa1464ffd7b1d3edc7a8d5d9a24a321c5d",
+  "benchmarks_internal_rev": "175974d2b43dae39c380fc5f7f583a377cd3c11d",
   "checkout_benchmarks_internal": False,
 
   # Checkout the flute benchmark only when benchmarking.

diff --git a/benchmarks/Iterators/dart/Iterators.dart b/benchmarks/Iterators/dart/Iterators.dart
@@ -508,7 +508,7 @@ void pollute() {
 ///
 ///    Run benchmarks with name containing all the dot-separated words in the
 ///    selector, so `--Set.const` will run benchmark
-///    'Iterators.const.Set.int.N`, and `--2.UpTo` will select
+///    `Iterators.const.Set.int.N`, and `--2.UpTo` will select
 ///    `Iterators.UpTo.2`.  Each selector is matched independently, and if
 ///    selectors are used, only benchmarks matching some selector are run.
 ///

diff --git a/benchmarks/LongStringCompare/dart/LongStringCompare.dart b/benchmarks/LongStringCompare/dart/LongStringCompare.dart
@@ -26,13 +26,6 @@ class LongStringCompare extends BenchmarkBase {
     s.add(single + '!' + single);
   }
 
-  @override
-  void warmup() {
-    for (int i = 0; i < reps / 2; i++) {
-      run();
-    }
-  }
-
   @override
   void run() {
     for (int i = 0; i < reps; i++) {

diff --git a/benchmarks/MD5/dart/md5.dart b/benchmarks/MD5/dart/md5.dart
@@ -16,13 +16,6 @@ class MD5Bench extends BenchmarkBase {
       : data = List<int>.generate(size, (i) => i % 256, growable: false),
         super('MD5');
 
-  @override
-  void warmup() {
-    for (int i = 0; i < 4; i++) {
-      run();
-    }
-  }
-
   @override
   void run() {
     final hash = md5.convert(data);

diff --git a/benchmarks/MD5/dart2/md5.dart b/benchmarks/MD5/dart2/md5.dart
@@ -21,13 +21,6 @@ class MD5Bench extends BenchmarkBase {
     }
   }
 
-  @override
-  void warmup() {
-    for (int i = 0; i < 4; i++) {
-      run();
-    }
-  }
-
   @override
   void run() {
     final hash = md5.convert(data);

diff --git a/benchmarks/SHA1/dart/sha1.dart b/benchmarks/SHA1/dart/sha1.dart
@@ -16,13 +16,6 @@ class SHA1Bench extends BenchmarkBase {
       : data = List<int>.generate(size, (i) => i % 256, growable: false),
         super('SHA1');
 
-  @override
-  void warmup() {
-    for (int i = 0; i < 4; i++) {
-      run();
-    }
-  }
-
   @override
   void run() {
     final hash = sha1.convert(data);

diff --git a/benchmarks/SHA1/dart2/sha1.dart b/benchmarks/SHA1/dart2/sha1.dart
@@ -21,13 +21,6 @@ class SHA1Bench extends BenchmarkBase {
     }
   }
 
-  @override
-  void warmup() {
-    for (int i = 0; i < 4; i++) {
-      run();
-    }
-  }
-
   @override
   void run() {
     final hash = sha1.convert(data);

diff --git a/benchmarks/SHA256/dart/sha256.dart b/benchmarks/SHA256/dart/sha256.dart
@@ -17,13 +17,6 @@ class SHA256Bench extends BenchmarkBase {
       : data = List<int>.generate(size, (i) => i % 256, growable: false),
         super('SHA256');
 
-  @override
-  void warmup() {
-    for (int i = 0; i < 4; i++) {
-      run();
-    }
-  }
-
   @override
   void run() {
     final hash = sha256.convert(data);

diff --git a/benchmarks/SHA256/dart2/sha256.dart b/benchmarks/SHA256/dart2/sha256.dart
@@ -22,13 +22,6 @@ class SHA256Bench extends BenchmarkBase {
     }
   }
 
-  @override
-  void warmup() {
-    for (int i = 0; i < 4; i++) {
-      run();
-    }
-  }
-
   @override
   void run() {
     final hash = sha256.convert(data);

diff --git a/benchmarks/TypedDataDuplicate/dart/TypedDataDuplicate.dart b/benchmarks/TypedDataDuplicate/dart/TypedDataDuplicate.dart
@@ -24,13 +24,6 @@ abstract class Uint8ListCopyBenchmark extends BenchmarkBase {
     }
   }
 
-  @override
-  void warmup() {
-    for (var i = 0; i < 100; ++i) {
-      run();
-    }
-  }
-
   @override
   void teardown() {
     for (var i = 0; i < size; ++i) {

diff --git a/benchmarks/TypedDataDuplicate/dart2/TypedDataDuplicate.dart b/benchmarks/TypedDataDuplicate/dart2/TypedDataDuplicate.dart
@@ -26,13 +26,6 @@ abstract class Uint8ListCopyBenchmark extends BenchmarkBase {
     }
   }
 
-  @override
-  void warmup() {
-    for (var i = 0; i < 100; ++i) {
-      run();
-    }
-  }
-
   @override
   void teardown() {
     for (var i = 0; i < size; ++i) {

diff --git a/benchmarks/Utf8Decode/dart/Utf8Decode.dart b/benchmarks/Utf8Decode/dart/Utf8Decode.dart
@@ -29,7 +29,9 @@ class Utf8Decode extends BenchmarkBase {
     String name = 'Utf8Decode.$language.';
     name += size >= 1000000
         ? '${size ~/ 1000000}M'
-        : size >= 1000 ? '${size ~/ 1000}k' : '$size';
+        : size >= 1000
+            ? '${size ~/ 1000}k'
+            : '$size';
     if (allowMalformed) name += '.malformed';
     return name;
   }
@@ -93,11 +95,6 @@ class Utf8Decode extends BenchmarkBase {
     run();
   }
 
-  @override
-  void warmup() {
-    BenchmarkBase.measureFor(run, 1000);
-  }
-
   @override
   double measure() {
     // Report time per input byte.

diff --git a/benchmarks/Utf8Decode/dart2/Utf8Decode.dart b/benchmarks/Utf8Decode/dart2/Utf8Decode.dart
@@ -31,7 +31,9 @@ class Utf8Decode extends BenchmarkBase {
     String name = 'Utf8Decode.$language.';
     name += size >= 1000000
         ? '${size ~/ 1000000}M'
-        : size >= 1000 ? '${size ~/ 1000}k' : '$size';
+        : size >= 1000
+            ? '${size ~/ 1000}k'
+            : '$size';
     if (allowMalformed) name += '.malformed';
     return name;
   }
@@ -95,11 +97,6 @@ class Utf8Decode extends BenchmarkBase {
     run();
   }
 
-  @override
-  void warmup() {
-    BenchmarkBase.measureFor(run, 1000);
-  }
-
   @override
   double measure() {
     // Report time per input byte.

diff --git a/benchmarks/Utf8DecodeComplex/dart/benchmarks.dart b/benchmarks/Utf8DecodeComplex/dart/benchmarks.dart
@@ -164,11 +164,6 @@ class Utf8DecodeBenchmarkBase extends BenchmarkBase {
     run();
   }
 
-  @override
-  void warmup() {
-    BenchmarkBase.measureFor(run, 100);
-  }
-
   @override
   double measure() {
     // Report time per input byte.

diff --git a/benchmarks/Utf8Encode/dart/Utf8Encode.dart b/benchmarks/Utf8Encode/dart/Utf8Encode.dart
@@ -66,11 +66,6 @@ class Utf8Encode extends BenchmarkBase {
     run();
   }
 
-  @override
-  void warmup() {
-    BenchmarkBase.measureFor(run, 1000);
-  }
-
   @override
   double measure() {
     // Report time per input rune.

diff --git a/benchmarks/Utf8Encode/dart2/Utf8Encode.dart b/benchmarks/Utf8Encode/dart2/Utf8Encode.dart
@@ -69,11 +69,6 @@ class Utf8Encode extends BenchmarkBase {
     run();
   }
 
-  @override
-  void warmup() {
-    BenchmarkBase.measureFor(run, 1000);
-  }
-
   @override
   double measure() {
     // Report time per input rune.

diff --git a/pkg/_fe_analyzer_shared/lib/src/macros/executor/execute_macro.dart b/pkg/_fe_analyzer_shared/lib/src/macros/executor/execute_macro.dart
@@ -66,9 +66,7 @@ Future<MacroExecutionResult> executeTypesMacro(
       builder.failWithException(e);
     } else {
       // Convert exceptions thrown by macro implementations into diagnostics.
-      builder.report(new Diagnostic(
-          new DiagnosticMessage('Unhandled error: $e\n' 'Stack trace:\n$s'),
-          Severity.error));
+      builder.report(_unexpectedExceptionDiagnostic(e, s));
     }
   }
   return builder.result;
@@ -146,9 +144,7 @@ Future<MacroExecutionResult> executeDeclarationsMacro(Macro macro,
       builder.failWithException(e);
     } else {
       // Convert exceptions thrown by macro implementations into diagnostics.
-      builder.report(new Diagnostic(
-          new DiagnosticMessage('Unhandled error: $e\n' 'Stack trace:\n$s'),
-          Severity.error));
+      builder.report(_unexpectedExceptionDiagnostic(e, s));
     }
   }
   return builder.result;
@@ -223,10 +219,21 @@ Future<MacroExecutionResult> executeDefinitionMacro(Macro macro, Object target,
       builder.failWithException(e);
     } else {
       // Convert exceptions thrown by macro implementations into diagnostics.
-      builder.report(new Diagnostic(
-          new DiagnosticMessage('Unhandled error: $e\n' 'Stack trace:\n$s'),
-          Severity.error));
+      builder.report(_unexpectedExceptionDiagnostic(e, s));
     }
   }
   return builder.result;
 }
+
+// It's a bug in the macro but we need to show something to the user; put the
+// debug detail in a context message and suggest reporting to the author.
+Diagnostic _unexpectedExceptionDiagnostic(
+        Object thrown, StackTrace stackTrace) =>
+    new Diagnostic(
+        new DiagnosticMessage(
+            'Macro application failed due to a bug in the macro.'),
+        Severity.error,
+        contextMessages: [
+          new DiagnosticMessage('$thrown\n$stackTrace'),
+        ],
+        correctionMessage: 'Try reporting the failure to the macro author.');
diff --git a/pkg/analyzer/test/src/dart/resolution/macro_test.dart b/pkg/analyzer/test/src/dart/resolution/macro_test.dart
@@ -90,10 +90,10 @@ class A {}
         18,
         10,
         messageContains: [
-          'Unhandled error',
-          'package:test/a.dart',
-          'unresolved',
-          'MyMacro',
+          'Macro application failed due to a bug in the macro.',
+        ],
+        contextMessages: [
+          message('/home/test/lib/test.dart', 18, 10),
         ],
       ),
     ]);
@@ -908,10 +908,10 @@ class A {}
         18,
         10,
         messageContains: [
-          'Unhandled error',
-          'package:test/a.dart',
-          '12345',
-          'MyMacro',
+          'Macro application failed due to a bug in the macro.'
+        ],
+        contextMessages: [
+          message('/home/test/lib/test.dart', 18, 10),
         ],
       ),
     ]);

diff --git a/pkg/analyzer/test/src/summary/element_text.dart b/pkg/analyzer/test/src/summary/element_text.dart
@@ -794,7 +794,7 @@ class _ElementWriter {
         validator(object.message);
       } else {
         final message = object.message;
-        const stackTraceText = 'Stack trace:';
+        const stackTraceText = '#0';
         final stackTraceIndex = message.indexOf(stackTraceText);
         if (stackTraceIndex >= 0) {
           final end = stackTraceIndex + stackTraceText.length;