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

Unified Diff: runtime/vm/flow_graph_compiler_x64.cc

Issue 798643003: Pass condition result explicitly. Do not imply the existence of a status (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years 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 | « runtime/vm/flow_graph_compiler_mips.cc ('k') | runtime/vm/intermediate_language_arm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler_x64.cc
===================================================================
--- runtime/vm/flow_graph_compiler_x64.cc (revision 42293)
+++ runtime/vm/flow_graph_compiler_x64.cc (working copy)
@@ -1417,10 +1417,11 @@
}
-void FlowGraphCompiler::EmitEqualityRegConstCompare(Register reg,
- const Object& obj,
- bool needs_number_check,
- intptr_t token_pos) {
+Condition FlowGraphCompiler::EmitEqualityRegConstCompare(
+ Register reg,
+ const Object& obj,
+ bool needs_number_check,
+ intptr_t token_pos) {
ASSERT(!needs_number_check ||
(!obj.IsMint() && !obj.IsDouble() && !obj.IsBigint()));
@@ -1427,7 +1428,7 @@
if (obj.IsSmi() && (Smi::Cast(obj).Value() == 0)) {
ASSERT(!needs_number_check);
__ testq(reg, reg);
- return;
+ return EQUAL;
}
if (needs_number_check) {
@@ -1444,19 +1445,20 @@
Isolate::kNoDeoptId,
token_pos);
}
+ // Stub returns result in flags (result of a cmpq, we need ZF computed).
__ popq(reg); // Discard constant.
__ popq(reg); // Restore 'reg'.
- return;
+ } else {
+ __ CompareObject(reg, obj, PP);
}
-
- __ CompareObject(reg, obj, PP);
+ return EQUAL;
}
-void FlowGraphCompiler::EmitEqualityRegRegCompare(Register left,
- Register right,
- bool needs_number_check,
- intptr_t token_pos) {
+Condition FlowGraphCompiler::EmitEqualityRegRegCompare(Register left,
+ Register right,
+ bool needs_number_check,
+ intptr_t token_pos) {
if (needs_number_check) {
StubCode* stub_code = isolate()->stub_code();
__ pushq(left);
@@ -1478,12 +1480,13 @@
__ movq(RBX, Immediate(kInvalidObjectPointer));
}
#endif
- // Stub returns result in flags (result of a cmpl, we need ZF computed).
+ // Stub returns result in flags (result of a cmpq, we need ZF computed).
__ popq(right);
__ popq(left);
} else {
__ cmpl(left, right);
}
+ return EQUAL;
}
« no previous file with comments | « runtime/vm/flow_graph_compiler_mips.cc ('k') | runtime/vm/intermediate_language_arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698