Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(722)

Unified Diff: runtime/vm/flow_graph_compiler_mips.cc

Issue 12457034: Ensure that all goto instructions have deoptimization target. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/flow_graph_compiler_mips.cc
diff --git a/runtime/vm/flow_graph_compiler_mips.cc b/runtime/vm/flow_graph_compiler_mips.cc
index 1a88c4d5ff95ee5e6961ae0d45cbe5ff662f911b..6facfc27a19a4dbe8788820984c9a4bb3389ced6 100644
--- a/runtime/vm/flow_graph_compiler_mips.cc
+++ b/runtime/vm/flow_graph_compiler_mips.cc
@@ -127,7 +127,6 @@ RawSubtypeTestCache* FlowGraphCompiler::GenerateInlineInstanceof(
void FlowGraphCompiler::GenerateInstanceOf(intptr_t token_pos,
- intptr_t deopt_id,
const AbstractType& type,
bool negate_result,
LocationSummary* locs) {
@@ -148,9 +147,18 @@ void FlowGraphCompiler::EmitInstructionPrologue(Instruction* instr) {
if (!is_optimizing()) {
if (FLAG_enable_type_checks && instr->IsAssertAssignable()) {
AssertAssignableInstr* assert = instr->AsAssertAssignable();
- AddCurrentDescriptor(PcDescriptors::kDeoptBefore,
+ AddCurrentDescriptor(PcDescriptors::kDeopt,
assert->deopt_id(),
assert->token_pos());
+ } else if (instr->IsGuardField()) {
+ GuardFieldInstr* guard = instr->AsGuardField();
+ AddCurrentDescriptor(PcDescriptors::kDeopt,
+ guard->deopt_id(),
+ Scanner::kDummyTokenIndex);
+ } else if (instr->CanBeDeoptimizationTarget()) {
+ AddCurrentDescriptor(PcDescriptors::kDeopt,
+ instr->deopt_id(),
+ Scanner::kDummyTokenIndex);
}
AllocateRegistersLocally(instr);
}

Powered by Google App Engine
This is Rietveld 408576698