Version 3.6.0-274.0.dev

Merge 7667df5 into dev
dart-lang · Sep 24, 2024 · 7af8c48 · 7af8c48
2 parents 24ed9af + 7667df5
commit 7af8c48
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 31 deletions.
diff --git a/runtime/tests/vm/dart/regress_56756_il_test.dart b/runtime/tests/vm/dart/regress_56756_il_test.dart
@@ -9,21 +9,29 @@ import 'package:vm/testing/il_matchers.dart';
 
 import 'dart:math';
 
+@pragma('vm:never-inline')
+void myprint(Object o) {
+  print(o);
+}
+
 class RandomValue {
   final bool shouldReturnValue;
   const RandomValue(this.shouldReturnValue);
 
+  @pragma('vm:never-inline')
+  String randomString() => Random().nextInt(42).toString();
+
   @pragma('vm:prefer-inline')
   String? get valueOrNull {
-    return shouldReturnValue ? "${Random().nextInt(42)}" : null;
+    return shouldReturnValue ? randomString() : null;
   }
 }
 
 @pragma('vm:never-inline')
 @pragma('vm:testing:print-flow-graph')
 void doTest(RandomValue value) {
   if (value.valueOrNull case final String aString) {
-    print(aString);
+    myprint(aString);
   }
 }
 
@@ -48,8 +56,6 @@ void matchIL$doTest(FlowGraph graph) {
     ]),
     'B8' <<
         match.block('Target', [
-          match.StaticCall(),
-          match.StaticCall(),
           'v19' << match.StaticCall(),
           match.Goto('B10'),
         ]),

diff --git a/tools/VERSION b/tools/VERSION
@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 6
 PATCH 0
-PRERELEASE 273
+PRERELEASE 274
 PRERELEASE_PATCH 0
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
@@ -641,12 +641,19 @@
         "compiler": "fasta"
       }
     },
-    "analyzer-(linux|mac|win)": {
+    "analyzer-(linux|win)": {
       "options": {
         "compiler": "dart2analyzer",
         "use-sdk": true
       }
     },
+    "analyzer-mac": {
+      "options": {
+        "architecture": "arm64",
+        "compiler": "dart2analyzer",
+        "use-sdk": true
+      }
+    },
     "analyzer-asserts-(linux|mac|win)": {
       "options": {
         "compiler": "dart2analyzer",
@@ -3001,21 +3008,6 @@
             "--suppress-analytics",
             "runtime/observatory"
           ]
-        },
-        {
-          "_comment": "This uses analyzer_cli which is deprecated.",
-          "name": "dartanalyzer --batch tests",
-          "arguments": [
-            "-nanalyzer-${system}"
-          ]
-        },
-        {
-          "_comment": "This uses analyzer_cli which is deprecated.",
-          "name": "dartanalyzer --batch pkg tests",
-          "arguments": [
-            "-nanalyzer-${system}",
-            "pkg"
-          ]
         }
       ]
     },

diff --git a/tools/spec_parser/Dart.g b/tools/spec_parser/Dart.g
@@ -4,6 +4,9 @@
 
 // CHANGES:
 //
+// v0.47 Make `augment` a built-in identifier (this happened in the feature
+// specification v1.10, but wasn't done here at the time).
+//
 // v0.46 Rename `libraryDefinition` to `libraryDeclaration`, as in the
 // language specification. Add support for libraries with imports.
 //
@@ -1679,6 +1682,7 @@ reservedWord
 builtInIdentifier
     :    ABSTRACT
     |    AS
+    |    AUGMENT
     |    COVARIANT
     |    DEFERRED
     |    DYNAMIC
@@ -1704,7 +1708,6 @@ builtInIdentifier
 
 otherIdentifierNotType
     :    ASYNC
-    |    AUGMENT
     |    BASE
     |    HIDE
     |    OF
@@ -1889,6 +1892,10 @@ AS
     :    'as'
     ;
 
+AUGMENT
+    :    'augment'
+    ;
+
 COVARIANT
     :    'covariant'
     ;
@@ -1989,10 +1996,6 @@ ASYNC
     :    'async'
     ;
 
-AUGMENT
-    :    'augment'
-    ;
-
 BASE
     :    'base'
     ;

diff --git a/tools/spec_parser/dart_spec_parser/Dart.g4 b/tools/spec_parser/dart_spec_parser/Dart.g4
@@ -4,6 +4,9 @@
 
 // CHANGES:
 //
+// v0.48 Make `augment` a built-in identifier (this happened in the feature
+// specification v1.10, but wasn't done here at the time).
+//
 // v0.47 Rename `libraryDefinition` to `libraryDeclaration`, as in the
 // language specification. Add support for libraries with imports.
 //
@@ -1685,6 +1688,7 @@ reservedWord
 builtInIdentifier
     :    ABSTRACT
     |    AS
+    |    AUGMENT
     |    COVARIANT
     |    DEFERRED
     |    DYNAMIC
@@ -1710,7 +1714,6 @@ builtInIdentifier
 
 otherIdentifierNotType
     :    ASYNC
-    |    AUGMENT
     |    BASE
     |    HIDE
     |    OF
@@ -1895,6 +1898,10 @@ AS
     :    'as'
     ;
 
+AUGMENT
+    :    'augment'
+    ;
+
 COVARIANT
     :    'covariant'
     ;
@@ -1995,10 +2002,6 @@ ASYNC
     :    'async'
     ;
 
-AUGMENT
-    :    'augment'
-    ;
-
 BASE
     :    'base'
     ;