Version 2.18.0-246.0.dev

Merge commit '81d86a05b2d7159cf8c63acbcc752a86d49bbaad' into 'dev'

Author: Dart CI

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

@@ -8531,9 +8531,20 @@ class Parser {
         if (comment.indexOf('```', /* start = */ 3) != -1) {
           inCodeBlock = !inCodeBlock;
         }
-        if (!inCodeBlock && !comment.startsWith('///    ')) {
-          count += parseCommentReferencesInText(
-              token, /* start = */ 3, comment.length);
+        if (!inCodeBlock) {
+          bool parseReferences;
+          if (comment.startsWith('///    ')) {
+            String? previousComment = token.previous?.lexeme;
+            parseReferences = previousComment != null &&
+                previousComment.startsWith('///') &&
+                previousComment.trim().length > 3;
+          } else {
+            parseReferences = true;
+          }
+          if (parseReferences) {
+            count += parseCommentReferencesInText(
+                token, /* start = */ 3, comment.length);
+          }
         }
       }
       token = token.next;

pkg/analyzer/test/generated/simple_parser_test.dart

@@ -866,6 +866,20 @@ abstract class Foo {}
     expect(nextToken.type, TokenType.EOF);
   }
 
+  void test_parseCommentReferences_notCodeBlock_4spaces_afterText() {
+    List<DocumentationCommentToken> tokens = <DocumentationCommentToken>[
+      DocumentationCommentToken(
+          TokenType.SINGLE_LINE_COMMENT, "/// comment:", 0),
+      DocumentationCommentToken(
+          TokenType.SINGLE_LINE_COMMENT, "///    a[i] == b[i]", 0)
+    ];
+    createParser('');
+    List<CommentReference> references = parser.parseCommentReferences(tokens);
+    expectNotNullIfNoErrors(references);
+    assertNoErrors();
+    expect(references, hasLength(2));
+  }
+
   void test_parseCommentReferences_singleLine() {
     List<DocumentationCommentToken> tokens = <DocumentationCommentToken>[
       DocumentationCommentToken(
@@ -891,6 +905,36 @@ abstract class Foo {}
     expect(reference.offset, 35);
   }
 
+  void test_parseCommentReferences_skipCodeBlock_4spaces_afterEmptyComment() {
+    List<DocumentationCommentToken> tokens = <DocumentationCommentToken>[
+      DocumentationCommentToken(
+          TokenType.SINGLE_LINE_COMMENT, "/// Code block:", 0),
+      DocumentationCommentToken(TokenType.SINGLE_LINE_COMMENT, "///", 0),
+      DocumentationCommentToken(
+          TokenType.SINGLE_LINE_COMMENT, "///    a[i] == b[i]", 0)
+    ];
+    createParser('');
+    List<CommentReference> references = parser.parseCommentReferences(tokens);
+    expectNotNullIfNoErrors(references);
+    assertNoErrors();
+    expect(references, isEmpty);
+  }
+
+  void test_parseCommentReferences_skipCodeBlock_4spaces_afterEmptyLine() {
+    List<DocumentationCommentToken> tokens = <DocumentationCommentToken>[
+      DocumentationCommentToken(
+          TokenType.SINGLE_LINE_COMMENT, "/// Code block:", 0),
+      DocumentationCommentToken(TokenType.SINGLE_LINE_COMMENT, "", 0),
+      DocumentationCommentToken(
+          TokenType.SINGLE_LINE_COMMENT, "///    a[i] == b[i]", 0)
+    ];
+    createParser('');
+    List<CommentReference> references = parser.parseCommentReferences(tokens);
+    expectNotNullIfNoErrors(references);
+    assertNoErrors();
+    expect(references, isEmpty);
+  }
+
   void test_parseCommentReferences_skipCodeBlock_4spaces_block() {
     List<DocumentationCommentToken> tokens = <DocumentationCommentToken>[
       DocumentationCommentToken(TokenType.MULTI_LINE_COMMENT,
@@ -903,12 +947,10 @@ abstract class Foo {}
     expect(references, isEmpty);
   }
 
-  void test_parseCommentReferences_skipCodeBlock_4spaces_lines() {
+  void test_parseCommentReferences_skipCodeBlock_4spaces_first() {
     List<DocumentationCommentToken> tokens = <DocumentationCommentToken>[
       DocumentationCommentToken(
-          TokenType.SINGLE_LINE_COMMENT, "/// Code block:", 0),
-      DocumentationCommentToken(
-          TokenType.SINGLE_LINE_COMMENT, "///     a[i] == b[i]", 0)
+          TokenType.SINGLE_LINE_COMMENT, "///    a[i] == b[i]", 0)
     ];
     createParser('');
     List<CommentReference> references = parser.parseCommentReferences(tokens);

pkg/dev_compiler/lib/src/kernel/expression_compiler.dart

@@ -163,13 +163,17 @@ class DartScopeBuilder extends Visitor<void> with VisitorVoidMixin {
 
   @override
   void visitVariableDeclaration(VariableDeclaration decl) {
+    var name = decl.name;
     // Collect locals and formals appearing before current breakpoint.
     // Note that we include variables with no offset because the offset
     // is not set in many cases in generated code, so omitting them would
     // make expression evaluation fail in too many cases.
     // Issue: https://github.com/dart-lang/sdk/issues/43966
-    if (decl.fileOffset < 0 || decl.fileOffset < _offset) {
-      _definitions[decl.name!] = decl.type;
+    //
+    // A null name signals that the variable was synthetically introduced by the
+    // compiler so they are skipped.
+    if ((decl.fileOffset < 0 || decl.fileOffset < _offset) && name != null) {
+      _definitions[name] = decl.type;
     }
     super.visitVariableDeclaration(decl);
   }

pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart

@@ -356,6 +356,35 @@ void runNullSafeSharedTests(SetupCompilerOptions setup, TestDriver driver) {
           expectedResult: 'true');
     });
   });
+
+  group('Synthetic variables', () {
+    var source = r'''
+      dynamic couldReturnNull() => null;
+
+      main() {
+        var i = couldReturnNull() ?? 10;
+        // Breakpoint: bp
+        print(i);
+      }
+        ''';
+
+    setUpAll(() async {
+      await driver.initSource(setup, source);
+    });
+
+    tearDownAll(() async {
+      await driver.cleanupTest();
+    });
+
+    test('do not cause a crash the expression compiler', () async {
+      // The null aware code in the test source causes the compiler to introduce
+      // a let statement that includes a synthetic variable declaration.
+      // That variable has no name and was causing a crash in the expression
+      // compiler https://github.com/dart-lang/sdk/issues/49373.
+      await driver.check(
+          breakpointId: 'bp', expression: 'true', expectedResult: 'true');
+    });
+  });
 }
 
 /// Shared tests that are valid in legacy (before 2.12) and are agnostic to

pkg/test_runner/lib/src/configuration.dart

@@ -333,16 +333,19 @@ class TestConfiguration {
       _compilerConfiguration ??= CompilerConfiguration(this);
 
   /// The set of [Feature]s supported by this configuration.
-  late final Set<Feature> supportedFeatures = {
-    // TODO(rnystrom): Define more features for things like "dart:io", separate
-    // int/double representation, etc.
-    if (NnbdMode.legacy == configuration.nnbdMode)
-      Feature.nnbdLegacy
-    else
-      Feature.nnbd,
-    if (NnbdMode.weak == configuration.nnbdMode) Feature.nnbdWeak,
-    if (NnbdMode.strong == configuration.nnbdMode) Feature.nnbdStrong,
-  };
+  late final Set<Feature> supportedFeatures = compiler == Compiler.dart2analyzer
+      // The analyzer should parse all tests.
+      ? {...Feature.all}
+      : {
+          // TODO(rnystrom): Define more features for things like "dart:io", separate
+          // int/double representation, etc.
+          if (NnbdMode.legacy == configuration.nnbdMode)
+            Feature.nnbdLegacy
+          else
+            Feature.nnbd,
+          if (NnbdMode.weak == configuration.nnbdMode) Feature.nnbdWeak,
+          if (NnbdMode.strong == configuration.nnbdMode) Feature.nnbdStrong,
+        };
 
   /// Determines if this configuration has a compatible compiler and runtime
   /// and other valid fields.

pkg/test_runner/lib/src/testing_servers.dart

@@ -48,7 +48,7 @@ class DispatchingServer {
 ///                directory (i.e. '$BuildDirectory/X').
 /// /FOO/packages/PAZ/BAR: This will serve files from the packages listed in
 ///      the package spec .packages.  Supports a package
-///      root or custom package spec, and uses [dart_dir]/.packages
+///      root or custom package spec, and uses $dart_dir/.packages
 ///      as the default. This will serve file lib/BAR from the package PAZ.
 /// /ws: This will upgrade the connection to a WebSocket connection and echo
 ///      all data back to the client.

runtime/lib/timeline.cc

@@ -24,11 +24,15 @@ DEFINE_NATIVE_ENTRY(Timeline_isDartStreamEnabled, 0, 0) {
   return Bool::False().ptr();
 }
 
-DEFINE_NATIVE_ENTRY(Timeline_getNextTaskId, 0, 0) {
+DEFINE_NATIVE_ENTRY(Timeline_getNextAsyncId, 0, 0) {
 #if !defined(SUPPORT_TIMELINE)
   return Integer::New(0);
 #else
-  return Integer::New(thread->GetNextTaskId());
+  TimelineEventRecorder* recorder = Timeline::recorder();
+  if (recorder == NULL) {
+    return Integer::New(0);
+  }
+  return Integer::New(recorder->GetNextAsyncId());
 #endif
 }
 

runtime/vm/bootstrap_natives.h

@@ -153,7 +153,7 @@ namespace dart {
   V(TypeError_throwNew, 4)                                                     \
   V(Stopwatch_now, 0)                                                          \
   V(Stopwatch_frequency, 0)                                                    \
-  V(Timeline_getNextTaskId, 0)                                                 \
+  V(Timeline_getNextAsyncId, 0)                                                \
   V(Timeline_getTraceClock, 0)                                                 \
   V(Timeline_isDartStreamEnabled, 0)                                           \
   V(Timeline_reportFlowEvent, 5)                                               \

runtime/vm/compiler/asm_intrinsifier_arm.cc

@@ -1900,23 +1900,6 @@ void AsmIntrinsifier::Timeline_isDartStreamEnabled(Assembler* assembler,
 #endif
 }
 
-void AsmIntrinsifier::Timeline_getNextTaskId(Assembler* assembler,
-                                             Label* normal_ir_body) {
-#if !defined(SUPPORT_TIMELINE)
-  __ LoadImmediate(R0, target::ToRawSmi(0));
-  __ Ret();
-#else
-  __ ldr(R1, Address(THR, target::Thread::next_task_id_offset()));
-  __ ldr(R2, Address(THR, target::Thread::next_task_id_offset() + 4));
-  __ SmiTag(R0, R1);  // Ignore loss of precision.
-  __ adds(R1, R1, Operand(1));
-  __ adcs(R2, R2, Operand(0));
-  __ str(R1, Address(THR, target::Thread::next_task_id_offset()));
-  __ str(R2, Address(THR, target::Thread::next_task_id_offset() + 4));
-  __ Ret();
-#endif
-}
-
 #undef __
 
 }  // namespace compiler

runtime/vm/compiler/asm_intrinsifier_arm64.cc

@@ -2146,20 +2146,6 @@ void AsmIntrinsifier::Timeline_isDartStreamEnabled(Assembler* assembler,
 #endif
 }
 
-void AsmIntrinsifier::Timeline_getNextTaskId(Assembler* assembler,
-                                             Label* normal_ir_body) {
-#if !defined(SUPPORT_TIMELINE)
-  __ LoadImmediate(R0, target::ToRawSmi(0));
-  __ ret();
-#else
-  __ ldr(R0, Address(THR, target::Thread::next_task_id_offset()));
-  __ add(R1, R0, Operand(1));
-  __ str(R1, Address(THR, target::Thread::next_task_id_offset()));
-  __ SmiTag(R0);  // Ignore loss of precision.
-  __ ret();
-#endif
-}
-
 #undef __
 
 }  // namespace compiler

runtime/vm/compiler/asm_intrinsifier_ia32.cc

@@ -1937,24 +1937,6 @@ void AsmIntrinsifier::Timeline_isDartStreamEnabled(Assembler* assembler,
 #endif
 }
 
-void AsmIntrinsifier::Timeline_getNextTaskId(Assembler* assembler,
-                                             Label* normal_ir_body) {
-#if !defined(SUPPORT_TIMELINE)
-  __ LoadImmediate(EAX, target::ToRawSmi(0));
-  __ ret();
-#else
-  __ movl(EBX, Address(THR, target::Thread::next_task_id_offset()));
-  __ movl(ECX, Address(THR, target::Thread::next_task_id_offset() + 4));
-  __ movl(EAX, EBX);
-  __ SmiTag(EAX);  // Ignore loss of precision.
-  __ addl(EBX, Immediate(1));
-  __ adcl(ECX, Immediate(0));
-  __ movl(Address(THR, target::Thread::next_task_id_offset()), EBX);
-  __ movl(Address(THR, target::Thread::next_task_id_offset() + 4), ECX);
-  __ ret();
-#endif
-}
-
 #undef __
 
 }  // namespace compiler

runtime/vm/compiler/asm_intrinsifier_riscv.cc

@@ -2160,30 +2160,6 @@ void AsmIntrinsifier::Timeline_isDartStreamEnabled(Assembler* assembler,
 #endif
 }
 
-void AsmIntrinsifier::Timeline_getNextTaskId(Assembler* assembler,
-                                             Label* normal_ir_body) {
-#if !defined(SUPPORT_TIMELINE)
-  __ LoadImmediate(A0, target::ToRawSmi(0));
-  __ ret();
-#elif XLEN == 64
-  __ ld(A0, Address(THR, target::Thread::next_task_id_offset()));
-  __ addi(A1, A0, 1);
-  __ sd(A1, Address(THR, target::Thread::next_task_id_offset()));
-  __ SmiTag(A0);  // Ignore loss of precision.
-  __ ret();
-#else
-  __ lw(T0, Address(THR, target::Thread::next_task_id_offset()));
-  __ lw(T1, Address(THR, target::Thread::next_task_id_offset() + 4));
-  __ SmiTag(A0, T0);  // Ignore loss of precision.
-  __ addi(T2, T0, 1);
-  __ sltu(T3, T2, T0);  // Carry.
-  __ add(T1, T1, T3);
-  __ sw(T2, Address(THR, target::Thread::next_task_id_offset()));
-  __ sw(T1, Address(THR, target::Thread::next_task_id_offset() + 4));
-  __ ret();
-#endif
-}
-
 #undef __
 
 }  // namespace compiler

runtime/vm/compiler/asm_intrinsifier_x64.cc

@@ -2034,21 +2034,6 @@ void AsmIntrinsifier::Timeline_isDartStreamEnabled(Assembler* assembler,
 #endif
 }
 
-void AsmIntrinsifier::Timeline_getNextTaskId(Assembler* assembler,
-                                             Label* normal_ir_body) {
-#if !defined(SUPPORT_TIMELINE)
-  __ xorq(RAX, RAX);  // Return Smi 0.
-  __ ret();
-#else
-  __ movq(RAX, Address(THR, target::Thread::next_task_id_offset()));
-  __ movq(RBX, RAX);
-  __ incq(RBX);
-  __ movq(Address(THR, target::Thread::next_task_id_offset()), RBX);
-  __ SmiTag(RAX);  // Ignore loss of precision.
-  __ ret();
-#endif
-}
-
 #undef __
 
 }  // namespace compiler

runtime/vm/compiler/recognized_methods_list.h

@@ -438,7 +438,6 @@ namespace dart {
   V(::, _getDefaultTag, UserTag_defaultTag, 0x6c19c8a5)                        \
   V(::, _getCurrentTag, Profiler_getCurrentTag, 0x70ead08e)                    \
   V(::, _isDartStreamEnabled, Timeline_isDartStreamEnabled, 0xc97aafb3)        \
-  V(::, _getNextTaskId, Timeline_getNextTaskId, 0x5b2b0b0b)                    \
 
 #define INTERNAL_LIB_INTRINSIC_LIST(V)                                         \
   V(::, allocateOneByteString, AllocateOneByteString, 0x9e7745d5)              \

runtime/vm/compiler/runtime_api.h

@@ -1250,7 +1250,6 @@ class Thread : public AllStatic {
   THREAD_XMM_CONSTANT_LIST(DECLARE_CONSTANT_OFFSET_GETTER)
 #undef DECLARE_CONSTANT_OFFSET_GETTER
 
-  static word next_task_id_offset();
   static word random_offset();
 
   static word suspend_state_init_async_entry_point_offset();