| Index: vm/flow_graph_compiler_x64.cc
|
| ===================================================================
|
| --- vm/flow_graph_compiler_x64.cc (revision 16591)
|
| +++ vm/flow_graph_compiler_x64.cc (working copy)
|
| @@ -61,7 +61,7 @@
|
| Label fall_through;
|
| __ cmpq(bool_register, raw_null);
|
| __ j(EQUAL, &fall_through, Assembler::kNearJump);
|
| - __ CompareObject(bool_register, bool_true());
|
| + __ CompareObject(bool_register, Bool::True());
|
| __ j(EQUAL, is_true);
|
| __ jmp(is_false);
|
| __ Bind(&fall_through);
|
| @@ -496,21 +496,21 @@
|
| __ Drop(5);
|
| if (negate_result) {
|
| __ popq(RDX);
|
| - __ LoadObject(RAX, bool_true());
|
| + __ LoadObject(RAX, Bool::True());
|
| __ cmpq(RDX, RAX);
|
| __ j(NOT_EQUAL, &done, Assembler::kNearJump);
|
| - __ LoadObject(RAX, bool_false());
|
| + __ LoadObject(RAX, Bool::False());
|
| } else {
|
| __ popq(RAX);
|
| }
|
| __ jmp(&done, Assembler::kNearJump);
|
| }
|
| __ Bind(&is_not_instance);
|
| - __ LoadObject(RAX, negate_result ? bool_true() : bool_false());
|
| + __ LoadObject(RAX, negate_result ? Bool::True() : Bool::False());
|
| __ jmp(&done, Assembler::kNearJump);
|
|
|
| __ Bind(&is_instance);
|
| - __ LoadObject(RAX, negate_result ? bool_false() : bool_true());
|
| + __ LoadObject(RAX, negate_result ? Bool::False() : Bool::True());
|
| __ Bind(&done);
|
| __ popq(RDX); // Remove pushed instantiator type arguments.
|
| __ popq(RCX); // Remove pushed instantiator.
|
| @@ -1250,11 +1250,11 @@
|
| __ cmpq(result, Address(RSP, 0 * kWordSize));
|
| Label is_false;
|
| __ j(NOT_EQUAL, &is_false, Assembler::kNearJump);
|
| - __ LoadObject(result, bool_true());
|
| + __ LoadObject(result, Bool::True());
|
| __ Drop(1);
|
| __ jmp(skip_call);
|
| __ Bind(&is_false);
|
| - __ LoadObject(result, bool_false());
|
| + __ LoadObject(result, Bool::False());
|
| __ Drop(1);
|
| __ jmp(skip_call);
|
| __ Bind(&fall_through);
|
|
|