[vm/bytecode] Throw should be 'debug checked', but not ReThrow.

crelier · commit-bot@chromium.org · commit a290271dea55 · 2019-08-28T22:20:53.000Z
Since both throw and rethrow statements share the same 'Throw' bytecode opcode (differentiated by an operand), we make the opcode not implicitly 'debug checked' anymore. Instead, we emit a 'DebugCheck' opcode for the throw statement only. This fixes the following test: service/async_single_step_exception_test Change-Id: I4e540ea0a640fda5365d51933ce4e5125548e2f2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/114754 Commit-Queue: Régis Crelier <regis@google.com> Reviewed-by: Alexander Markov <alexmarkov@google.com>
diff --git a/pkg/vm/lib/bytecode/gen_bytecode.dart b/pkg/vm/lib/bytecode/gen_bytecode.dart
@@ -3174,6 +3174,10 @@ class BytecodeGenerator extends RecursiveVisitor<Null> {
   @override
   visitThrow(Throw node) {
     _generateNode(node.expression);
+
+    if (options.emitDebuggerStops) {
+      asm.emitDebugCheck();
+    }
     asm.emitThrow(0);
   }
 
diff --git a/runtime/vm/compiler/frontend/bytecode_flow_graph_builder.cc b/runtime/vm/compiler/frontend/bytecode_flow_graph_builder.cc
@@ -1569,8 +1569,6 @@ void BytecodeFlowGraphBuilder::BuildThrow() {
     UNIMPLEMENTED();  // TODO(alexmarkov): interpreter
   }
 
-  BuildDebugStepCheck();
-
   if (DecodeOperandA().value() == 0) {
     // throw
     LoadStackSlots(1);
diff --git a/runtime/vm/constants_kbc.h b/runtime/vm/constants_kbc.h
@@ -994,7 +994,6 @@ class KernelBytecode {
       case KernelBytecode::kDynamicCall:
       case KernelBytecode::kDynamicCall_Wide:
       case KernelBytecode::kReturnTOS:
-      case KernelBytecode::kThrow:
       case KernelBytecode::kEqualsNull:
       case KernelBytecode::kNegateInt:
       case KernelBytecode::kNegateDouble:
diff --git a/runtime/vm/interpreter.cc b/runtime/vm/interpreter.cc
@@ -1780,7 +1780,6 @@ RawObject* Interpreter::Call(RawFunction* function,
 
   {
     BYTECODE(Throw, A);
-    DEBUG_CHECK;
     {
       SP[1] = 0;  // Space for result.
       Exit(thread, FP, SP + 2, pc);

Original file line number	Diff line number	Diff line change
`@@ -1569,8 +1569,6 @@ void BytecodeFlowGraphBuilder::BuildThrow() {`
`1569`	`1569`	`UNIMPLEMENTED(); // TODO(alexmarkov): interpreter`
`1570`	`1570`	`}`
`1571`	`1571`
`1572`		`- BuildDebugStepCheck();`
`1573`		`-`
`1574`	`1572`	`if (DecodeOperandA().value() == 0) {`
`1575`	`1573`	`// throw`
`1576`	`1574`	`LoadStackSlots(1);`
Original file line number	Diff line number	Diff line change
`@@ -1780,7 +1780,6 @@ RawObject* Interpreter::Call(RawFunction* function,`
`1780`	`1780`
`1781`	`1781`	`{`
`1782`	`1782`	`BYTECODE(Throw, A);`
`1783`		`- DEBUG_CHECK;`
`1784`	`1783`	`{`
`1785`	`1784`	`SP[1] = 0; // Space for result.`
`1786`	`1785`	`Exit(thread, FP, SP + 2, pc);`