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

Unified Diff: runtime/vm/flow_graph_compiler_x64.cc

Issue 15741002: Use a uniform way to emit code for all instructions. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 7 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_x64.cc
diff --git a/runtime/vm/flow_graph_compiler_x64.cc b/runtime/vm/flow_graph_compiler_x64.cc
index dd764eac913b1f0d3de647199ad2b6d46d852895..935aa9ae005ddfb983c3156a7d80a8bda351ff63 100644
--- a/runtime/vm/flow_graph_compiler_x64.cc
+++ b/runtime/vm/flow_graph_compiler_x64.cc
@@ -724,12 +724,7 @@ void FlowGraphCompiler::EmitInstructionPrologue(Instruction* instr) {
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()) {
+ } else if (instr->CanBeDeoptimizationTarget() || instr->IsGuardField()) {
AddCurrentDescriptor(PcDescriptors::kDeopt,
instr->deopt_id(),
Scanner::kDummyTokenIndex);

Powered by Google App Engine
This is Rietveld 408576698