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

Unified Diff: runtime/vm/flow_graph_compiler_arm64.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_arm.cc ('k') | runtime/vm/flow_graph_compiler_ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler_arm64.cc
===================================================================
--- runtime/vm/flow_graph_compiler_arm64.cc (revision 42293)
+++ runtime/vm/flow_graph_compiler_arm64.cc (working copy)
@@ -1357,10 +1357,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) {
if (needs_number_check) {
StubCode* stub_code = isolate()->stub_code();
ASSERT(!obj.IsMint() && !obj.IsDouble() && !obj.IsBigint());
@@ -1378,19 +1379,20 @@
Isolate::kNoDeoptId,
token_pos);
}
+ // Stub returns result in flags (result of a cmp, we need Z computed).
__ Drop(1); // Discard constant.
__ Pop(reg); // Restore 'reg'.
- return;
+ } else {
+ __ CompareObject(reg, obj, PP);
}
-
- __ CompareObject(reg, obj, PP);
+ return EQ;
}
-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();
__ Push(left);
@@ -1414,12 +1416,13 @@
__ LoadImmediate(R5, kInvalidObjectPointer, kNoPP);
}
#endif
- // Stub returns result in flags (result of a cmpl, we need ZF computed).
+ // Stub returns result in flags (result of a cmp, we need Z computed).
__ Pop(right);
__ Pop(left);
} else {
__ CompareRegisters(left, right);
}
+ return EQ;
}
« no previous file with comments | « runtime/vm/flow_graph_compiler_arm.cc ('k') | runtime/vm/flow_graph_compiler_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698