Chromium Code Reviews| Index: src/arm/builtins-arm.cc |
| diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc |
| index 25eff43b463cc36bdd50213d22b815c593bcf2e8..d9f4e37f5314f04d042a823df1b0c85cff5ae3d9 100644 |
| --- a/src/arm/builtins-arm.cc |
| +++ b/src/arm/builtins-arm.cc |
| @@ -965,6 +965,11 @@ void Builtins::Generate_OnStackReplacement(MacroAssembler* masm) { |
| // <deopt_data> = <code>[#deoptimization_data_offset] |
| __ ldr(r1, MemOperand(r0, Code::kDeoptimizationDataOffset - kHeapObjectTag)); |
| + ConstantPoolUnavailableScope constant_pool_unavailable(masm); |
| + if (FLAG_enable_ool_constant_pool) { |
| + __ ldr(pp, MemOperand(r0, Code::kConstantPoolOffset - kHeapObjectTag)); |
|
Rodolph Perfetta (ARM)
2014/03/12 14:46:20
use FieldMemOperand so you don't need to substract
rmcilroy
2014/03/17 18:31:34
Done (also for surrounding calls).
|
| + } |
| + |
| // Load the OSR entrypoint offset from the deoptimization data. |
| // <osr_offset> = <deopt_data>[#header_size + #osr_pc_offset] |
| __ ldr(r1, MemOperand(r1, FixedArray::OffsetOfElementAt( |