commit bc8b6fb94de1796bdcb7b02f0c5ce14ba369400a
author Alexander Markov <alexmarkov@google.com> Mon Jun 24 19:25:07 2019 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Mon Jun 24 19:25:07 2019 +0000
tree ce253c6f2ced8576b1d17f5a3913018468eaf604
parent efc85cac7ce7062303c6ac375fa6eef7bebd7466

[vm/bytecode] Fix last source position in a function

Change-Id: Id3b9c6476cc3745a39a7010b7ae09d2422467e31
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107182
Reviewed-by: Régis Crelier <regis@google.com>
Commit-Queue: Alexander Markov <alexmarkov@google.com>

pkg/vm/lib/bytecode/gen_bytecode.dart

diff --git a/pkg/vm/lib/bytecode/gen_bytecode.dart b/pkg/vm/lib/bytecode/gen_bytecode.dart
index 894471a..db0c918 100644
--- a/pkg/vm/lib/bytecode/gen_bytecode.dart
+++ b/pkg/vm/lib/bytecode/gen_bytecode.dart
@@ -700,6 +700,9 @@
             // BytecodeAssembler eliminates this bytecode if it is unreachable.
             asm.emitPushNull();
           }
+          if (node.function != null) {
+            _recordSourcePosition(node.function.fileEndOffset);
+          }
           _genReturnTOS();
         }
       } else {
@@ -1931,9 +1934,9 @@
     _generateNode(function.body);
 
     // BytecodeAssembler eliminates this bytecode if it is unreachable.
+    _recordSourcePosition(function.fileEndOffset);
     asm.emitPushNull();
     _genReturnTOS();
-    _recordSourcePosition(function.fileEndOffset);
 
     if (locals.isSyncYieldingFrame) {
       _genSyncYieldingEpilogue(