Version 2.19.0-373.0.dev

Merge 6cc1c3c into dev

Author: Dart CI

DEPS

@@ -53,7 +53,7 @@ vars = {
   # hashes.
   "co19_rev": "642b786a850a9de5ab75ce872c98d7d560fe9fc2",
   # This line prevents conflicts when both packages are rolled simultaneously.
-  "co19_2_rev": "6dc80bd1ff15d0854eaba0c7e5d606ec0ad6b3db",
+  "co19_2_rev": "cdab7e4e26f3dd534bcb297ff3f9e9aa5c7a04fb",
 
   # The internal benchmarks to use. See go/dart-benchmarks-internal
   "benchmarks_internal_rev": "599aa474a03c37be146f82dfbad85f34f25ffa47",

pkg/analysis_server/lib/src/analysis_server.dart

@@ -429,6 +429,8 @@ abstract class AnalysisServer {
       var libraryPath = unitElement.element.library.source.fullName;
       var result = await currentSession.getResolvedLibrary(libraryPath);
       return result is ResolvedLibraryResult ? result : null;
+    } on InconsistentAnalysisException {
+      return null;
     } catch (exception, stackTrace) {
       instrumentationService.logException(exception, stackTrace);
     }

pkg/front_end/lib/src/fasta/builder/named_type_builder.dart

@@ -400,6 +400,13 @@ abstract class NamedTypeBuilder extends TypeBuilder {
   DartType _buildInternal(
       LibraryBuilder library, TypeUse typeUse, ClassHierarchyBase? hierarchy) {
     DartType aliasedType = _buildAliasedInternal(library, typeUse, hierarchy);
+
+    if (library is SourceLibraryBuilder &&
+        !isRecordAccessAllowed(library.libraryFeatures) &&
+        isDartCoreRecord(aliasedType)) {
+      library.reportFeatureNotEnabled(library.libraryFeatures.records,
+          fileUri ?? library.fileUri, charOffset!, nameText.length);
+    }
     return unalias(aliasedType,
         legacyEraseAliases:
             !_performTypeCanonicalization && !library.isNonNullableByDefault);
@@ -412,7 +419,7 @@ abstract class NamedTypeBuilder extends TypeBuilder {
     DartType builtType = _buildAliasedInternal(library, typeUse, hierarchy);
     if (library is SourceLibraryBuilder &&
         !isRecordAccessAllowed(library.libraryFeatures) &&
-        isRecordOrItsAlias(builtType)) {
+        isDartCoreRecord(builtType)) {
       library.reportFeatureNotEnabled(library.libraryFeatures.records,
           fileUri ?? library.fileUri, charOffset!, nameText.length);
     }
@@ -704,16 +711,7 @@ class _ExplicitNamedTypeBuilder extends NamedTypeBuilder {
   @override
   DartType build(LibraryBuilder library, TypeUse typeUse,
       {ClassHierarchyBase? hierarchy}) {
-    DartType builtType = _buildInternal(library, typeUse, hierarchy);
-
-    if (library is SourceLibraryBuilder &&
-        !isRecordAccessAllowed(library.libraryFeatures) &&
-        isRecordOrItsAlias(builtType)) {
-      library.reportFeatureNotEnabled(library.libraryFeatures.records,
-          fileUri ?? library.fileUri, charOffset!, nameText.length);
-    }
-
-    return _type ??= builtType;
+    return _type ??= _buildInternal(library, typeUse, hierarchy);
   }
 }
 

pkg/front_end/lib/src/fasta/incremental_compiler.dart

@@ -1241,8 +1241,7 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
 
       for (Uri uri in builderUris) {
         List<int>? previousSource =
-            CompilerContext.current.uriToSource[uri]!.source;
-        // ignore: unnecessary_null_comparison
+            CompilerContext.current.uriToSource[uri]?.source;
         if (previousSource == null || previousSource.isEmpty) {
           recorderForTesting?.recordAdvancedInvalidationResult(
               AdvancedInvalidationResult.noPreviousSource);

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

@@ -2313,11 +2313,6 @@ class BodyBuilder extends StackListenerImpl
           libraryFeatures.patterns, case_.charOffset, case_.charCount);
       Pattern pattern = toPattern(pop());
       Expression expression = popForValue();
-      for (VariableDeclaration variable in pattern.declaredVariables) {
-        // Skip synthetic variables.
-        if (variable.name == null) continue;
-        declareVariable(variable, scope);
-      }
       push(new Condition(expression, pattern, guard));
     } else {
       assert(checkState(token, [
@@ -3459,10 +3454,20 @@ class BodyBuilder extends StackListenerImpl
   @override
   void beginThenStatement(Token token) {
     debugEvent("beginThenStatement");
+    assert(checkState(token, [ValueKinds.Condition]));
     // This is matched by the call to [deferNode] in
     // [endThenStatement].
     typeInferrer.assignedVariables.beginNode();
+    Condition condition = peek() as Condition;
     enterLocalScope("then");
+    Pattern? pattern = condition.pattern;
+    if (pattern != null) {
+      for (VariableDeclaration variable in pattern.declaredVariables) {
+        // Skip synthetic variables.
+        if (variable.name == null) continue;
+        declareVariable(variable, scope);
+      }
+    }
   }
 
   @override