| Index: runtime/vm/flow_graph_compiler_arm.cc
|
| ===================================================================
|
| --- runtime/vm/flow_graph_compiler_arm.cc (revision 42293)
|
| +++ runtime/vm/flow_graph_compiler_arm.cc (working copy)
|
| @@ -1381,10 +1381,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());
|
| @@ -1402,19 +1403,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);
|
| }
|
| -
|
| - __ CompareObject(reg, obj);
|
| + 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);
|
| @@ -1438,12 +1440,13 @@
|
| __ LoadImmediate(R5, kInvalidObjectPointer);
|
| }
|
| #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 {
|
| __ cmp(left, Operand(right));
|
| }
|
| + return EQ;
|
| }
|
|
|
|
|
|
|