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

Unified Diff: runtime/vm/flow_graph_optimizer.cc

Issue 21081003: Fix incorrectly factored-out code in https://codereview.chromium.org/20468002/ (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_optimizer.cc
===================================================================
--- runtime/vm/flow_graph_optimizer.cc (revision 25622)
+++ runtime/vm/flow_graph_optimizer.cc (working copy)
@@ -2777,15 +2777,14 @@
Instruction* current_instruction) {
ASSERT(ic_data.num_args_tested() == 2);
ASSERT(comp->operation_cid() == kIllegalCid);
- Instruction* instr = current_iterator()->Current();
if (HasOnlyTwoSmis(ic_data)) {
- InsertBefore(instr,
+ InsertBefore(current_instruction,
new CheckSmiInstr(comp->left()->Copy(), comp->deopt_id()),
- instr->env(),
+ current_instruction->env(),
Definition::kEffect);
- InsertBefore(instr,
+ InsertBefore(current_instruction,
new CheckSmiInstr(comp->right()->Copy(), comp->deopt_id()),
- instr->env(),
+ current_instruction->env(),
Definition::kEffect);
comp->set_operation_cid(kSmiCid);
} else if (HasTwoMintOrSmi(ic_data) &&
@@ -2800,11 +2799,11 @@
// We cannot use double comparison on two Smi-s.
ASSERT(comp->operation_cid() == kIllegalCid);
} else {
- InsertBefore(instr,
+ InsertBefore(current_instruction,
new CheckEitherNonSmiInstr(comp->left()->Copy(),
comp->right()->Copy(),
comp->deopt_id()),
- instr->env(),
+ current_instruction->env(),
Definition::kEffect);
comp->set_operation_cid(kDoubleCid);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698