Chromium Code Reviews| Index: src/a64/code-stubs-a64.cc |
| diff --git a/src/a64/code-stubs-a64.cc b/src/a64/code-stubs-a64.cc |
| index 81f4a5657d19c5db35cbb2588c0467330168036d..893a843314da823721b919b696419276e8cf87cc 100644 |
| --- a/src/a64/code-stubs-a64.cc |
| +++ b/src/a64/code-stubs-a64.cc |
| @@ -2565,7 +2565,7 @@ void CEntryStub::Generate(MacroAssembler* masm) { |
| // fall-back Abort mechanism. |
| // |
| // Note that this stub must be generated before any use of Abort. |
| - masm->set_use_real_aborts(false); |
| + MacroAssembler::NoUseRealAbortsScope no_use_real_aborts(masm); |
| ASM_LOCATION("CEntryStub::Generate entry"); |
| ProfileEntryHookStub::MaybeCallEntryHook(masm); |
| @@ -2708,8 +2708,6 @@ void CEntryStub::Generate(MacroAssembler* masm) { |
| __ Mov(argc, 0); |
| __ Mov(target, 0); |
| __ Throw(x0, x10, x11, x12, x13); |
| - |
| - masm->set_use_real_aborts(true); |
| } |
| @@ -2743,6 +2741,8 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
| __ Mov(jssp, csp); |
| __ SetStackPointer(jssp); |
| + ProfileEntryHookStub::MaybeCallEntryHook(masm); |
| + |
| // Build an entry frame (see layout below). |
| Isolate* isolate = masm->isolate(); |
| @@ -6455,6 +6455,7 @@ void ProfileEntryHookStub::MaybeCallEntryHook(MacroAssembler* masm) { |
| void ProfileEntryHookStub::Generate(MacroAssembler* masm) { |
| + MacroAssembler::NoUseRealAbortsScope no_use_real_aborts(masm); |
| // The entry hook is a "BumpSystemStackPointer" instruction (sub), followed by |
| // a "Push lr" instruction, followed by a call. |
| // TODO(jbramley): Verify that this call is always made with relocation. |
| @@ -6929,7 +6930,7 @@ void ArrayConstructorStub::Generate(MacroAssembler* masm) { |
| // In type_info_cell, we expect either undefined or a valid Cell. |
| Label okay_here; |
| - Handle<Map> cell_map(masm->isolate()->heap()->global_property_cell_map()); |
| + Handle<Map> cell_map(masm->isolate()->heap()->cell_map()); |
|
Rodolph Perfetta (ARM)
2014/01/29 11:32:47
on arm, ia32 and x64 masm->isolate()->factory()->c
ulan
2014/01/29 17:18:05
Done.
|
| __ JumpIfRoot(type_info_cell, Heap::kUndefinedValueRootIndex, &okay_here); |
| __ Ldr(x10, FieldMemOperand(type_info_cell, Cell::kMapOffset)); |
| __ Cmp(x10, Operand(cell_map)); |