Version 2.19.0-430.0.dev

Merge 8b12c0c into dev

Author: Dart CI

CHANGELOG.md

@@ -50,7 +50,7 @@
   library-level documentation comments, and with this new feature, you don't
   have to provide a unique name for each library directive. Instead, a name can
   simply be omitted (see [#1073][]).
-  
+
 [#1073]: https://github.com/dart-lang/language/issues/1073
 
 ### Libraries
@@ -71,6 +71,8 @@
 - Deprecated `RangeError.checkValidIndex` in favor of `IndexError.check`.
 - Deprecated `IndexError` constructor in favor of `IndexError.withLength`
   constructor.
+- Deprecated `NullThrownError` and `CyclicInitializationError`.
+  Neither error is thrown by null safe code.
 
 [#49529]: https://github.com/dart-lang/sdk/issues/49529
 [#24644]: https://github.com/dart-lang/sdk/issues/24644

pkg/dart2wasm/dart2wasm.md

@@ -1,8 +1,8 @@
 ## Running dart2wasm
 
-You don't need to build the Dart SDK to run dart2wasm, as long as you have a Dart SDK installed.
+You don't need to build the Dart SDK to run dart2wasm, as long as you have a Dart SDK installed and have the [Dart SDK repository checked out](https://github.com/dart-lang/sdk/wiki/Building#getting-the-source).
 
-To compile a Dart file to Wasm, run:
+To compile a Dart file to Wasm, in a checkout of the Dart SDK repository, run:
 
 `dart --enable-asserts pkg/dart2wasm/bin/dart2wasm.dart` *options* *infile*`.dart` *outfile*`.wasm`
 

pkg/dart2wasm/lib/dispatch_table.dart

@@ -59,9 +59,6 @@ class SelectorInfo {
   /// Number of non-abstract references in [targets].
   late final int targetCount;
 
-  /// Whether this selector's member is invoked in a dynamic invocation.
-  bool _calledDynamically = false;
-
   /// When [targetCount] is 1, this holds the only non-abstract target of the
   /// selector.
   late final Reference? singularTarget;
@@ -304,7 +301,6 @@ class DispatchTable {
             _selectorMetadata[selectorId].callCount, paramInfo, returnCount));
     selector.paramInfo.merge(paramInfo);
     selector._returnCount = max(selector._returnCount, returnCount);
-    selector._calledDynamically |= calledDynamically;
     if (calledDynamically) {
       if (isGetter) {
         (_dynamicGets[member.name.text] ??= []).add(selector);
@@ -412,7 +408,7 @@ class DispatchTable {
 
     // Assign selector offsets
 
-    /// Whether the selector will be used in a dynamic or instance invocation.
+    /// Whether the selector will be used in an instance invocation.
     ///
     /// If not, then we don't add the selector to the dispatch table and don't
     /// assign it a dispatch table offset.
@@ -421,7 +417,6 @@ class DispatchTable {
     /// invocations of `objectNoSuchMethod` in dynamic calls, so keep it alive
     /// even if there was no references to it from the Dart code.
     bool needsDispatch(SelectorInfo selector) =>
-        (selector._calledDynamically && selector.targetCount > 0) ||
         (selector.callCount > 0 && selector.targetCount > 1) ||
         (selector.paramInfo.member! == translator.objectNoSuchMethod);
 

pkg/front_end/lib/src/fasta/kernel/body_builder.dart

@@ -2616,19 +2616,32 @@ class BodyBuilder extends StackListenerImpl
     reportIfNotEnabled(
         libraryFeatures.patterns, token.charOffset, token.charCount);
     // ignore: unused_local_variable
-    Pattern left = toPattern(pop());
-    // ignore: unused_local_variable
     Pattern right = toPattern(pop());
+    // ignore: unused_local_variable
+    Pattern left = toPattern(pop());
     // TODO(johnniwinther): Create a binary pattern.
 
     String operator = token.lexeme;
-    BinaryPatternKind kind;
     switch (operator) {
       case '&':
-        kind = BinaryPatternKind.and;
+        push(new AndPattern(left, right, token.charOffset));
         break;
       case '|':
-        kind = BinaryPatternKind.or;
+        Map<String, VariableDeclaration> leftVariablesByName = {
+          for (VariableDeclaration leftVariable in left.declaredVariables)
+            leftVariable.name!: leftVariable
+        };
+        if (!leftVariablesByName.keys.toSet().containsAll(
+                right.declaredVariables.map((variable) => variable.name!)) &&
+            leftVariablesByName.length == right.declaredVariables.length) {
+          // TODO(cstefantsova): Report a compile-time error.
+        }
+        push(new OrPattern(left, right, token.charOffset,
+            orPatternJointVariables: [
+              for (VariableDeclaration leftVariable in left.declaredVariables)
+                forest.createVariableDeclaration(
+                    leftVariable.fileOffset, leftVariable.name)
+            ]));
         break;
       default:
         internalProblem(
@@ -2637,7 +2650,6 @@ class BodyBuilder extends StackListenerImpl
             token.charOffset,
             uri);
     }
-    push(new BinaryPattern(left, kind, right, token.charOffset));
   }
 
   void doBinaryExpression(Token token) {
@@ -4408,8 +4420,8 @@ class BodyBuilder extends StackListenerImpl
         ValueKinds.Pattern,
       ])
     ]));
-    Pattern key = toPattern(pop());
     Pattern value = toPattern(pop());
+    Pattern key = toPattern(pop());
     push(new MapPatternEntry(key, value, colon.charOffset));
   }
 
@@ -7615,16 +7627,7 @@ class BodyBuilder extends StackListenerImpl
       Message message, String className,
       [int charOffset = -1]) {
     addProblemErrorIfConst(message, charOffset, className.length);
-    // TODO(ahe): The following doesn't make sense to Analyzer AST.
-    MemberBuilder constructor =
-        libraryBuilder.loader.getAbstractClassInstantiationError();
-    Expression invocation = buildStaticInvocation(
-        constructor.member,
-        forest.createArguments(charOffset,
-            <Expression>[forest.createStringLiteral(charOffset, className)]),
-        constness: Constness.explicitNew,
-        charOffset: charOffset);
-    return forest.createThrow(charOffset, invocation);
+    return new InvalidExpression(message.problemMessage);
   }
 
   Statement buildProblemStatement(Message message, int charOffset,

pkg/front_end/lib/src/fasta/kernel/constant_evaluator.dart

@@ -1566,7 +1566,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
     // ignore: unnecessary_null_comparison
     assert(named != null);
 
-    return new RecordConstant(positional, named, node.recordType);
+    return canonicalize(new RecordConstant(positional, named, node.recordType));
   }
 
   @override
@@ -3634,6 +3634,24 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
 
   bool hasPrimitiveEqual(Constant constant) {
     if (intFolder.isInt(constant)) return true;
+    if (constant is RecordConstant) {
+      bool nonPrimitiveEqualsFound = false;
+      for (Constant field in constant.positional) {
+        if (!hasPrimitiveEqual(field)) {
+          nonPrimitiveEqualsFound = true;
+          break;
+        }
+      }
+      for (Constant field in constant.named.values) {
+        if (!hasPrimitiveEqual(field)) {
+          nonPrimitiveEqualsFound = true;
+          break;
+        }
+      }
+      if (nonPrimitiveEqualsFound) {
+        return false;
+      }
+    }
     DartType type = constant.getType(_staticTypeContext!);
     return !(type is InterfaceType && !classHasPrimitiveEqual(type.classNode));
   }

pkg/front_end/lib/src/fasta/kernel/forest.dart

@@ -413,8 +413,11 @@ class Forest {
   /// [fileOffset]. The [condition] is the expression preceding the question
   /// mark. The [thenExpression] is the expression following the question mark.
   /// The [elseExpression] is the expression following the colon.
-  Expression createConditionalExpression(int fileOffset, Expression condition,
-      Expression thenExpression, Expression elseExpression) {
+  ConditionalExpression createConditionalExpression(
+      int fileOffset,
+      Expression condition,
+      Expression thenExpression,
+      Expression elseExpression) {
     return new ConditionalExpression(
         condition, thenExpression, elseExpression, const UnknownType())
       ..fileOffset = fileOffset;