Version 3.9.0-230.0.dev

Merge d194fce into dev

Author: Dart CI

pkg/_fe_analyzer_shared/test/flow_analysis/flow_analysis_test.dart

@@ -2377,7 +2377,10 @@ main() {
           x.as_('int'),
           checkPromoted(x, 'int'),
           checkPromoted(y, 'int'),
-        ]).catch_(body: [checkNotPromoted(x), checkPromoted(y, 'int')]),
+        ]).catch_(
+          type: 'dynamic',
+          body: [checkNotPromoted(x), checkPromoted(y, 'int')],
+        ),
       ]);
     });
 
@@ -2396,6 +2399,7 @@ main() {
             checkPromoted(x, 'int'),
             getSsaNodes((nodes) => ssaAfterTry = nodes[x]!),
           ]).catch_(
+            type: 'dynamic',
             body: [
               checkNotPromoted(x),
               getSsaNodes((nodes) => expect(nodes[x], isNot(ssaAfterTry))),
@@ -2418,7 +2422,7 @@ main() {
         try_([
           localFunction([x.write(expr('int?'))]),
           return_(),
-        ]).catch_(body: [x.as_('int'), checkNotPromoted(x)]),
+        ]).catch_(type: 'dynamic', body: [x.as_('int'), checkNotPromoted(x)]),
       ]);
     });
 
@@ -2429,8 +2433,11 @@ main() {
         h.run([
           declare(x, type: 'int?', initializer: expr('int?')),
           try_([])
-              .catch_(body: [x.as_('int'), checkPromoted(x, 'int')])
-              .catch_(body: [checkNotPromoted(x)]),
+              .catch_(
+                type: 'dynamic',
+                body: [x.as_('int'), checkPromoted(x, 'int')],
+              )
+              .catch_(type: 'dynamic', body: [checkNotPromoted(x)]),
         ]);
       },
     );
@@ -2447,6 +2454,54 @@ main() {
       ]);
     });
 
+    test('Exception variable is promotable', () {
+      var e = Var('e');
+      h.run([
+        try_([]).catch_(
+          exception: e,
+          body: [checkNotPromoted(e), e.as_('int'), checkPromoted(e, 'int')],
+        ),
+      ]);
+    });
+
+    test('Exception variable is promotable', () {
+      var e = Var('e');
+      h.run([
+        try_([]).catch_(
+          type: 'Object',
+          exception: e,
+          body: [
+            e.checkType('Object'),
+            checkNotPromoted(e),
+            e.as_('String'),
+            checkPromoted(e, 'String'),
+          ],
+        ),
+      ]);
+    });
+
+    test('StackTrace variable is promotable', () {
+      TypeRegistry.addInterfaceTypeName('StackTraceSubtype');
+      h.addSuperInterfaces(
+        'StackTraceSubtype',
+        (_) => [Type('StackTrace'), Type('Object')],
+      );
+      var e = Var('e');
+      var st = Var('st');
+      h.run([
+        try_([]).catch_(
+          exception: e,
+          stackTrace: st,
+          body: [
+            st.checkType('StackTrace'),
+            checkNotPromoted(st),
+            st.as_('StackTraceSubtype'),
+            checkPromoted(st, 'StackTraceSubtype'),
+          ],
+        ),
+      ]);
+    });
+
     test(
       'tryCatchStatement_catchEnd() joins catch state with after-try state',
       () {
@@ -2460,7 +2515,7 @@ main() {
           try_([
             x.as_('int'),
             y.as_('int'),
-          ]).catch_(body: [x.as_('int'), z.as_('int')]),
+          ]).catch_(type: 'dynamic', body: [x.as_('int'), z.as_('int')]),
           // Only x should be promoted, because it's the only variable
           // promoted in both the try body and the catch handler.
           checkPromoted(x, 'int'), checkNotPromoted(y), checkNotPromoted(z),
@@ -2477,8 +2532,8 @@ main() {
         declare(y, type: 'int?', initializer: expr('int?')),
         declare(z, type: 'int?', initializer: expr('int?')),
         try_([return_()])
-            .catch_(body: [x.as_('int'), y.as_('int')])
-            .catch_(body: [x.as_('int'), z.as_('int')]),
+            .catch_(type: 'dynamic', body: [x.as_('int'), y.as_('int')])
+            .catch_(type: 'dynamic', body: [x.as_('int'), z.as_('int')]),
         // Only x should be promoted, because it's the only variable promoted
         // in both catch handlers.
         checkPromoted(x, 'int'), checkNotPromoted(y), checkNotPromoted(z),

pkg/_fe_analyzer_shared/test/mini_ast.dart

@@ -1008,25 +1008,51 @@ class CastPattern extends Pattern {
 /// [TryBuilder.catch_] to create instances of this class.
 class CatchClause {
   final Statement body;
+  final Type? exceptionType;
   final Var? exception;
   final Var? stackTrace;
 
-  CatchClause._(this.body, this.exception, this.stackTrace);
+  CatchClause._(
+    this.body,
+    this.exceptionType,
+    this.exception,
+    this.stackTrace,
+  ) {
+    if (exception == null && stackTrace != null) {
+      fail(
+        'If a stack trace variable is provided, an exception variable must be '
+        'provided too',
+      );
+    }
+    if (exception == null && exceptionType == null) {
+      fail(
+        'If no exception variable is provided, an exception type must be '
+        'provided',
+      );
+    }
+  }
 
   @override
   String toString() {
-    String initialPart;
-    if (stackTrace != null) {
-      initialPart = 'catch (${exception!.name}, ${stackTrace!.name})';
-    } else if (exception != null) {
-      initialPart = 'catch (${exception!.name})';
-    } else {
-      initialPart = 'on ...';
-    }
-    return '$initialPart $body';
+    return [
+      if (exceptionType case var exceptionType?) 'on $exceptionType',
+      if (exception case Var(name: var exceptionName))
+        switch (stackTrace) {
+          Var(name: var stackTraceName) =>
+            'catch ($exceptionName, $stackTraceName)',
+          _ => 'catch ($exceptionName)',
+        },
+      body,
+    ].join(' ');
   }
 
   void _preVisit(PreVisitor visitor) {
+    if (exception case var exception?) {
+      visitor._assignedVariables.declare(exception);
+    }
+    if (stackTrace case var stackTrace?) {
+      visitor._assignedVariables.declare(stackTrace);
+    }
     body.preVisit(visitor);
   }
 }
@@ -5374,6 +5400,7 @@ class Throw extends Expression {
 
 abstract class TryBuilder {
   TryStatement catch_({
+    String? type,
     Var? exception,
     Var? stackTrace,
     required List<ProtoStatement> body,
@@ -5400,6 +5427,7 @@ class TryStatementImpl extends TryStatement {
 
   @override
   TryStatement catch_({
+    String? type,
     Var? exception,
     Var? stackTrace,
     required List<ProtoStatement> body,
@@ -5411,6 +5439,7 @@ class TryStatementImpl extends TryStatement {
         ...catches,
         CatchClause._(
           Block._(body, location: computeLocation()),
+          type == null ? null : Type(type),
           exception,
           stackTrace,
         ),
@@ -6749,6 +6778,8 @@ class _MiniAstTypeAnalyzer
     if (catchClauses.isNotEmpty) {
       flow.tryCatchStatement_bodyEnd(body);
       for (var catch_ in catchClauses) {
+        catch_.exception?._type = catch_.exceptionType ?? Type('dynamic');
+        catch_.stackTrace?._type = Type('StackTrace');
         flow.tryCatchStatement_catchBegin(catch_.exception, catch_.stackTrace);
         dispatchStatement(catch_.body);
         flow.tryCatchStatement_catchEnd();

pkg/_fe_analyzer_shared/test/mini_types.dart

@@ -1175,6 +1175,7 @@ abstract final class TypeRegistry {
     addInterfaceTypeName('Object');
     _add(stream);
     addInterfaceTypeName('String');
+    addInterfaceTypeName('StackTrace');
     _add(void_);
   }
 
@@ -1224,6 +1225,7 @@ class TypeSystem {
     'Map': (_) => [Type('Object')],
     'Object': (_) => [],
     'num': (_) => [Type('Object')],
+    'StackTrace': (_) => [Type('Object')],
     'String': (_) => [Type('Object')],
   };
 

pkg/analysis_server_plugin/lib/src/correction/ignore_diagnostic.dart

@@ -247,7 +247,7 @@ abstract class _BaseIgnoreDiagnostic extends ResolvedCorrectionProducer {
   /// - `error.code` is already ignored in the `errors` list.
   bool get _isCodeUnignorable {
     var cannotIgnore = (analysisOptions as AnalysisOptionsImpl)
-        .unignorableNames
+        .unignorableDiagnosticCodeNames
         .contains(diagnostic.diagnosticCode.name);
 
     if (cannotIgnore) {

pkg/analyzer/lib/src/dart/analysis/analysis_options.dart

@@ -59,7 +59,7 @@ final class AnalysisOptionsBuilder {
 
   FormatterOptions formatterOptions = FormatterOptions();
 
-  Set<String> unignorableNames = {};
+  Set<String> unignorableDiagnosticCodeNames = {};
 
   List<PluginConfiguration> pluginConfigurations = [];
 
@@ -81,7 +81,7 @@ final class AnalysisOptionsBuilder {
       chromeOsManifestChecks: chromeOsManifestChecks,
       codeStyleOptions: codeStyleOptions,
       formatterOptions: formatterOptions,
-      unignorableNames: unignorableNames,
+      unignorableDiagnosticCodeNames: unignorableDiagnosticCodeNames,
     );
   }
 
@@ -315,17 +315,19 @@ final class AnalysisOptionsBuilder {
           );
           if (processors.isNotEmpty &&
               processors.first.severity?.displayName == severity) {
-            unignorableNames.add(e.name);
+            unignorableDiagnosticCodeNames.add(e.name);
             continue;
           }
           // Otherwise, add [error] if its default severity is [severity].
           if (e.severity.displayName == severity) {
-            unignorableNames.add(e.name);
+            unignorableDiagnosticCodeNames.add(e.name);
           }
         }
       }
     }
-    unignorableNames.addAll(stringValues.map((name) => name.toUpperCase()));
+    unignorableDiagnosticCodeNames.addAll(
+      stringValues.map((name) => name.toUpperCase()),
+    );
   }
 }
 
@@ -402,10 +404,9 @@ class AnalysisOptionsImpl implements AnalysisOptions {
   @override
   final FormatterOptions formatterOptions;
 
-  /// The set of "un-ignorable" error names, as parsed from an analysis options
-  /// file.
-  // TODO(srawlins): Rename to `unignorableCodes`. 'Names' is ambiguous.
-  final Set<String> unignorableNames;
+  /// The set of "un-ignorable" diagnostic names, as parsed from an analysis
+  /// options file.
+  final Set<String> unignorableDiagnosticCodeNames;
 
   /// Returns a newly instantiated [AnalysisOptionsImpl].
   ///
@@ -514,7 +515,7 @@ class AnalysisOptionsImpl implements AnalysisOptions {
     required this.chromeOsManifestChecks,
     required this.codeStyleOptions,
     required this.formatterOptions,
-    required this.unignorableNames,
+    required this.unignorableDiagnosticCodeNames,
   }) : _contextFeatures = contextFeatures {
     (codeStyleOptions as CodeStyleOptionsImpl).options = this;
   }

pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

@@ -374,7 +374,7 @@ class LibraryAnalyzer {
         fileAnalysis.diagnosticListener.diagnostics,
         fileAnalysis.ignoreInfo,
         fileAnalysis.unit.lineInfo,
-        _analysisOptions.unignorableNames,
+        _analysisOptions.unignorableDiagnosticCodeNames,
         validateUnnecessaryIgnores,
       ).reportErrors();
     }
@@ -573,7 +573,7 @@ class LibraryAnalyzer {
       return diagnostics;
     }
 
-    var unignorableCodes = _analysisOptions.unignorableNames;
+    var unignorableCodes = _analysisOptions.unignorableDiagnosticCodeNames;
 
     bool isIgnored(Diagnostic diagnostic) {
       var code = diagnostic.diagnosticCode;

pkg/analyzer/test/src/options/analysis_options_test.dart

@@ -53,8 +53,11 @@ analyzer:
     - another
 ''');
 
-    var unignorableNames = analysisOptions.unignorableNames;
-    expect(unignorableNames, unorderedEquals(['ONE_ERROR_CODE', 'ANOTHER']));
+    var unignorableCodeNames = analysisOptions.unignorableDiagnosticCodeNames;
+    expect(
+      unignorableCodeNames,
+      unorderedEquals(['ONE_ERROR_CODE', 'ANOTHER']),
+    );
   }
 
   test_analyzer_cannotIgnore_severity() {
@@ -64,9 +67,9 @@ analyzer:
     - error
 ''');
 
-    var unignorableNames = analysisOptions.unignorableNames;
-    expect(unignorableNames, contains('INVALID_ANNOTATION'));
-    expect(unignorableNames.length, greaterThan(500));
+    var unignorableCodeNames = analysisOptions.unignorableDiagnosticCodeNames;
+    expect(unignorableCodeNames, contains('INVALID_ANNOTATION'));
+    expect(unignorableCodeNames.length, greaterThan(500));
   }
 
   test_analyzer_cannotIgnore_severity_withProcessor() {
@@ -78,8 +81,8 @@ analyzer:
     - error
 ''');
 
-    var unignorableNames = analysisOptions.unignorableNames;
-    expect(unignorableNames, contains('UNUSED_IMPORT'));
+    var unignorableCodeNames = analysisOptions.unignorableDiagnosticCodeNames;
+    expect(unignorableCodeNames, contains('UNUSED_IMPORT'));
   }
 
   test_analyzer_chromeos_checks() {

runtime/platform/utils_macos.cc

@@ -141,10 +141,15 @@ int32_t DarwinVersionInternal() {
   int32_t minor_version = 0;
 
 #if defined(DART_HOST_OS_IOS)
-  // We do not expect to run on version of iOS <12.0 so we can assume that
-  // kernel version is off by 6 from iOS version (e.g. kernel 18.0 is iOS 12.0).
-  // This only holds starting from iOS 4.0.
-  major_version = kernel_major_version - 6;
+  if (kernel_major_version >= 25) {
+    // Starting from iOS 26 kernel versions are 1 behind OS version.
+    major_version = kernel_major_version + 1;
+  } else {
+    // We do not expect to run on version of iOS <12.0 so we can assume that
+    // kernel version is off by 6 from iOS version (e.g. kernel 18.0 is
+    // iOS 12.0). This only holds starting from iOS 4.0.
+    major_version = kernel_major_version - 6;
+  }
   if (major_version >= 15) {
     // After iOS 15 minor version of kernel is the same as minor version of
     // the iOS release. Before iOS 15 these numbers were not in sync. However

runtime/platform/utils_macos.h

@@ -31,6 +31,7 @@ int32_t DarwinVersion();
   }
 
 DEFINE_IS_OS_FUNCS(18_4, 180400)
+DEFINE_IS_OS_FUNCS(26_0, 260000)
 
 #else