commit b574db44939e3113e6f45c08ee558bc96fe2304f
author Nate Biggs <natebiggs@google.com> Thu Dec 21 18:18:59 2023 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Dec 21 18:18:59 2023 +0000
tree b2f85f8a8b721b9cb1ac075ca34feab7d7998a0b
parent 3b27f54e00a227b0562c1f7a8f1228822a3dc941

[dart2js] Fix NamedFunction handling in OnlineJavascriptTracer.

Currently we're assigning the step to the underlying function expression rather than to the surrounding NamedFunction. To match the old implementation we should  assign the step to the parent.

Change-Id: I60138e9e78a39e6b26a5e2fa33dbf504cd21fcde
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/342981
Commit-Queue: Nate Biggs <natebiggs@google.com>
Reviewed-by: Stephen Adams <sra@google.com>

pkg/compiler/lib/src/io/position_information.dart

diff --git a/pkg/compiler/lib/src/io/position_information.dart b/pkg/compiler/lib/src/io/position_information.dart
index c67ca87..d9c8dfd 100644
--- a/pkg/compiler/lib/src/io/position_information.dart
+++ b/pkg/compiler/lib/src/io/position_information.dart
@@ -1549,26 +1549,27 @@
   @override
   visitNode(js.Node node, _) {}
 
-  void _handleFunction(js.Node node, js.Node body, int start) {
-    _currentNode.active =
-        _currentNode.active || reader.getSourceInformation(node) != null;
-    Offset entryOffset = getOffsetForNode(_currentNode.statementOffset, start);
-    notifyStep(node, entryOffset, StepKind.FUN_ENTRY);
+  void _handleFunction(_PositionInfoNode node, js.Node body, int start) {
+    _currentNode.active = _currentNode.active ||
+        reader.getSourceInformation(node.astNode) != null;
+    Offset entryOffset = getOffsetForNode(node.statementOffset, start);
+    notifyStep(node.astNode, entryOffset, StepKind.FUN_ENTRY);
 
     visit(body, statementOffset: start);
 
-    _currentNode.addNotifyStep(StepKind.FUN_EXIT);
+    node.addNotifyStep(StepKind.FUN_EXIT);
   }
 
   _handleFunctionExpression(js.FunctionExpression node, int start) {
-    final parentNode = _currentNode.parent!.astNode;
-    js.NamedFunction? namedParent;
+    final parentNode = _currentNode.parent;
+    final parentAstNode = _currentNode.parent?.astNode;
+    _PositionInfoNode functionNode = _currentNode;
     js.Expression? declaration;
-    if (parentNode is js.NamedFunction) {
-      namedParent = parentNode;
-      declaration = parentNode.name;
-    } else if (parentNode is js.FunctionDeclaration) {
-      declaration = parentNode.name;
+    if (parentAstNode is js.NamedFunction) {
+      functionNode = parentNode!;
+      declaration = parentAstNode.name;
+    } else if (parentAstNode is js.FunctionDeclaration) {
+      declaration = parentAstNode.name;
     }
 
     visit(declaration);
@@ -1576,7 +1577,7 @@
       visit(param);
     }
     // For named functions we treat the named parent as the main node.
-    _handleFunction(namedParent ?? node, node.body, start);
+    _handleFunction(functionNode, node.body, start);
   }
 
   @override