Version 2.19.0-247.0.dev

Merge 6945a72 into dev

Author: Dart CI

CHANGELOG.md

@@ -152,7 +152,10 @@ Updated the Linter to `1.28.0`, which includes changes that
 
 ## 2.18.2 - 2022-09-28
 
-This is a patch release that fixes incorrect behavior in `Uri.parse`.
+This is a patch release that:
+
+- fixes incorrect behavior in `Uri.parse`.
+- fixes a compiler crash (issue [#50052][]).
 
 ### Libraries
 
@@ -165,6 +168,8 @@ This is a patch release that fixes incorrect behavior in `Uri.parse`.
   The Dart `Uri` class is still not an implementation of the same standard
   as the browser's `URL` implementation.
 
+[#50052]: https://github.com/dart-lang/sdk/issues/50052
+
 ## 2.18.1 - 2022-09-14
 
 This is a patch release that fixes a crash caused by incorrect type inference

build/toolchain/win/BUILD.gn

@@ -22,6 +22,8 @@ assert(is_win)
 # This tool will is used as a wrapper for various commands below.
 tool_wrapper_path = rebase_path("tool_wrapper.py", root_build_dir)
 
+ninja_path = rebase_path("//buildtools/ninja/ninja")
+
 if (use_goma) {
   goma_prefix = "$goma_dir/gomacc.exe "
 } else {
@@ -72,7 +74,7 @@ template("msvc_toolchain") {
       # TODO(brettw) enable this when GN support in the binary has been rolled.
       #precompiled_header_type = "msvc"
       pdbname = "{{target_out_dir}}/{{target_output_name}}_c.pdb"
-      command = "ninja -t msvc -e $env -- $cl /nologo /showIncludes /FC @$rspfile /c {{source}} /Fo{{output}} /Fd$pdbname"
+      command = "$ninja_path -t msvc -e $env -- $cl /nologo /showIncludes /FC @$rspfile /c {{source}} /Fo{{output}} /Fd$pdbname"
       depsformat = "msvc"
       description = "CC {{output}}"
       outputs = [
@@ -93,7 +95,7 @@ template("msvc_toolchain") {
       if (is_clang && invoker.current_cpu == "x86") {
         flags = "-m32"
       }
-      command = "ninja -t msvc -e $env -- $cl $flags /nologo /showIncludes /FC @$rspfile /c {{source}} /Fo{{output}} /Fd$pdbname"
+      command = "$ninja_path -t msvc -e $env -- $cl $flags /nologo /showIncludes /FC @$rspfile /c {{source}} /Fo{{output}} /Fd$pdbname"
       depsformat = "msvc"
       description = "CXX {{output}}"
       outputs = [

pkg/_fe_analyzer_shared/lib/src/parser/class_member_parser.dart

@@ -45,7 +45,8 @@ class ClassMemberParser extends Parser {
   // This method is overridden for two reasons:
   // 1. Avoid generating events for arguments.
   // 2. Avoid calling skip expression for each argument (which doesn't work).
-  Token parseArgumentsOpt(Token token) => skipArgumentsOpt(token);
+  Token parseArgumentsOpt(Token token, {bool forPattern = false}) =>
+      skipArgumentsOpt(token);
 
   Token parseFunctionBody(Token token, bool isExpression, bool allowAbstract) {
     return skipFunctionBody(token, isExpression, allowAbstract);

pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart

@@ -35,6 +35,11 @@ class ForwardingListener implements Listener {
     listener?.beginBinaryExpression(token);
   }
 
+  @override
+  void beginBinaryPattern(Token token) {
+    listener?.beginBinaryPattern(token);
+  }
+
   @override
   void beginBlock(Token token, BlockKind blockKind) {
     listener?.beginBlock(token, blockKind);
@@ -522,6 +527,12 @@ class ForwardingListener implements Listener {
     listener?.endArguments(count, beginToken, endToken);
   }
 
+  @override
+  void handleExtractorPatternFields(
+      int count, Token beginToken, Token endToken) {
+    listener?.handleExtractorPatternFields(count, beginToken, endToken);
+  }
+
   @override
   void endAssert(Token assertKeyword, Assert kind, Token leftParenthesis,
       Token? commaToken, Token semicolonToken) {
@@ -539,6 +550,11 @@ class ForwardingListener implements Listener {
     listener?.endBinaryExpression(token);
   }
 
+  @override
+  void endBinaryPattern(Token token) {
+    listener?.endBinaryPattern(token);
+  }
+
   @override
   void handleEndingBinaryExpression(Token token) {
     listener?.handleEndingBinaryExpression(token);
@@ -1254,6 +1270,11 @@ class ForwardingListener implements Listener {
     listener?.handleAsOperator(operator);
   }
 
+  @override
+  void handleCastPattern(Token operator) {
+    listener?.handleCastPattern(operator);
+  }
+
   @override
   void handleAssignmentExpression(Token token) {
     listener?.handleAssignmentExpression(token);
@@ -1561,11 +1582,21 @@ class ForwardingListener implements Listener {
     listener?.handleLiteralList(count, beginToken, constKeyword, endToken);
   }
 
+  @override
+  void handleListPattern(int count, Token beginToken, Token endToken) {
+    listener?.handleListPattern(count, beginToken, endToken);
+  }
+
   @override
   void handleLiteralMapEntry(Token colon, Token endToken) {
     listener?.handleLiteralMapEntry(colon, endToken);
   }
 
+  @override
+  void handleMapPatternEntry(Token colon, Token endToken) {
+    listener?.handleMapPatternEntry(colon, endToken);
+  }
+
   @override
   void handleLiteralNull(Token token) {
     listener?.handleLiteralNull(token);
@@ -1585,6 +1616,11 @@ class ForwardingListener implements Listener {
         count, leftBrace, constKeyword, rightBrace, hasSetEntry);
   }
 
+  @override
+  void handleMapPattern(int count, Token leftBrace, Token rightBrace) {
+    listener?.handleMapPattern(count, leftBrace, rightBrace);
+  }
+
   @override
   void handleMixinHeader(Token mixinKeyword) {
     listener?.handleMixinHeader(mixinKeyword);
@@ -1600,6 +1636,11 @@ class ForwardingListener implements Listener {
     listener?.handleNamedArgument(colon);
   }
 
+  @override
+  void handlePatternField(Token? colon) {
+    listener?.handlePatternField(colon);
+  }
+
   @override
   void handleNamedRecordField(Token colon) {
     listener?.handleNamedRecordField(colon);
@@ -1680,6 +1721,21 @@ class ForwardingListener implements Listener {
     listener?.handleNonNullAssertExpression(bang);
   }
 
+  @override
+  void handleNullAssertPattern(Token bang) {
+    listener?.handleNullAssertPattern(bang);
+  }
+
+  @override
+  void handleNullCheckPattern(Token question) {
+    listener?.handleNullCheckPattern(question);
+  }
+
+  @override
+  void handleVariablePattern(Token? keyword, Token variable) {
+    listener?.handleVariablePattern(keyword, variable);
+  }
+
   @override
   void handleNoType(Token lastConsumed) {
     listener?.handleNoType(lastConsumed);
@@ -1716,8 +1772,8 @@ class ForwardingListener implements Listener {
   }
 
   @override
-  void handleParenthesizedCondition(Token token) {
-    listener?.handleParenthesizedCondition(token);
+  void handleParenthesizedCondition(Token token, Token? case_) {
+    listener?.handleParenthesizedCondition(token, case_);
   }
 
   @override
@@ -1730,11 +1786,32 @@ class ForwardingListener implements Listener {
     listener?.endRecordLiteral(token, count, constKeyword);
   }
 
+  @override
+  void handleRecordPattern(Token token, int count) {
+    listener?.handleRecordPattern(token, count);
+  }
+
   @override
   void endParenthesizedExpression(Token token) {
     listener?.endParenthesizedExpression(token);
   }
 
+  @override
+  void handleParenthesizedPattern(Token token) {
+    listener?.handleParenthesizedPattern(token);
+  }
+
+  @override
+  void handleConstantPattern(Token? constKeyword) {
+    listener?.handleConstantPattern(constKeyword);
+  }
+
+  @override
+  void handleExtractorPattern(
+      Token firstIdentifier, Token? dot, Token? secondIdentifier) {
+    listener?.handleExtractorPattern(firstIdentifier, dot, secondIdentifier);
+  }
+
   @override
   void handleQualified(Token period) {
     listener?.handleQualified(period);
@@ -1839,6 +1916,11 @@ class ForwardingListener implements Listener {
     listener?.handleUnaryPrefixExpression(token);
   }
 
+  @override
+  void handleRelationalPattern(Token token) {
+    listener?.handleRelationalPattern(token);
+  }
+
   @override
   void handleUnescapeError(
       Message message, Token location, int offset, int length) {