Index: src/deoptimizer.cc |
diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc |
index 35f340e8a31df3a4b42879ba5d63de9a2a83d40e..eaf33869ae872c0480d7d151b47d314cbb4e541b 100644 |
--- a/src/deoptimizer.cc |
+++ b/src/deoptimizer.cc |
@@ -992,7 +992,7 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator, |
DCHECK(!is_bottommost || !has_alignment_padding_ || |
(fp_value & kPointerSize) != 0); |
- if (FLAG_enable_ool_constant_pool) { |
+ if (FLAG_enable_embedded_constant_pool) { |
// For the bottommost output frame the constant pool pointer can be gotten |
// from the input frame. For subsequent output frames, it can be read from |
// the previous frame. |
@@ -1077,7 +1077,7 @@ void Deoptimizer::DoComputeJSFrame(TranslationIterator* iterator, |
output_frame->SetPc(pc_value); |
// Update constant pool. |
- if (FLAG_enable_ool_constant_pool) { |
+ if (FLAG_enable_embedded_constant_pool) { |
intptr_t constant_pool_value = |
reinterpret_cast<intptr_t>(non_optimized_code->constant_pool()); |
output_frame->SetConstantPool(constant_pool_value); |
@@ -1170,7 +1170,7 @@ void Deoptimizer::DoComputeArgumentsAdaptorFrame(TranslationIterator* iterator, |
fp_value, output_offset, value); |
} |
- if (FLAG_enable_ool_constant_pool) { |
+ if (FLAG_enable_embedded_constant_pool) { |
// Read the caller's constant pool from the previous frame. |
output_offset -= kPointerSize; |
value = output_[frame_index - 1]->GetConstantPool(); |
@@ -1225,7 +1225,7 @@ void Deoptimizer::DoComputeArgumentsAdaptorFrame(TranslationIterator* iterator, |
adaptor_trampoline->instruction_start() + |
isolate_->heap()->arguments_adaptor_deopt_pc_offset()->value()); |
output_frame->SetPc(pc_value); |
- if (FLAG_enable_ool_constant_pool) { |
+ if (FLAG_enable_embedded_constant_pool) { |
intptr_t constant_pool_value = |
reinterpret_cast<intptr_t>(adaptor_trampoline->constant_pool()); |
output_frame->SetConstantPool(constant_pool_value); |
@@ -1304,7 +1304,7 @@ void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator, |
fp_value, output_offset, value); |
} |
- if (FLAG_enable_ool_constant_pool) { |
+ if (FLAG_enable_embedded_constant_pool) { |
// Read the caller's constant pool from the previous frame. |
output_offset -= kPointerSize; |
value = output_[frame_index - 1]->GetConstantPool(); |
@@ -1392,7 +1392,7 @@ void Deoptimizer::DoComputeConstructStubFrame(TranslationIterator* iterator, |
construct_stub->instruction_start() + |
isolate_->heap()->construct_stub_deopt_pc_offset()->value()); |
output_frame->SetPc(pc); |
- if (FLAG_enable_ool_constant_pool) { |
+ if (FLAG_enable_embedded_constant_pool) { |
intptr_t constant_pool_value = |
reinterpret_cast<intptr_t>(construct_stub->constant_pool()); |
output_frame->SetConstantPool(constant_pool_value); |
@@ -1417,7 +1417,7 @@ void Deoptimizer::DoComputeAccessorStubFrame(TranslationIterator* iterator, |
// We need 1 stack entry for the return address and enough entries for the |
// StackFrame::INTERNAL (FP, context, frame type, code object and constant |
- // pool (if FLAG_enable_ool_constant_pool)- see MacroAssembler::EnterFrame). |
+ // pool (if enabled)- see MacroAssembler::EnterFrame). |
// For a setter stub frame we need one additional entry for the implicit |
// return value, see StoreStubCompiler::CompileStoreViaSetter. |
unsigned fixed_frame_entries = |
@@ -1467,7 +1467,7 @@ void Deoptimizer::DoComputeAccessorStubFrame(TranslationIterator* iterator, |
fp_value, output_offset, value); |
} |
- if (FLAG_enable_ool_constant_pool) { |
+ if (FLAG_enable_embedded_constant_pool) { |
// Read the caller's constant pool from the previous frame. |
output_offset -= kPointerSize; |
value = output_[frame_index - 1]->GetConstantPool(); |
@@ -1534,7 +1534,7 @@ void Deoptimizer::DoComputeAccessorStubFrame(TranslationIterator* iterator, |
intptr_t pc = reinterpret_cast<intptr_t>( |
accessor_stub->instruction_start() + offset->value()); |
output_frame->SetPc(pc); |
- if (FLAG_enable_ool_constant_pool) { |
+ if (FLAG_enable_embedded_constant_pool) { |
intptr_t constant_pool_value = |
reinterpret_cast<intptr_t>(accessor_stub->constant_pool()); |
output_frame->SetConstantPool(constant_pool_value); |
@@ -1641,7 +1641,7 @@ void Deoptimizer::DoComputeCompiledStubFrame(TranslationIterator* iterator, |
top_address + output_frame_offset, output_frame_offset, value); |
} |
- if (FLAG_enable_ool_constant_pool) { |
+ if (FLAG_enable_embedded_constant_pool) { |
// Read the caller's constant pool from the input frame. |
input_frame_offset -= kPointerSize; |
value = input_->GetFrameSlot(input_frame_offset); |
@@ -1783,7 +1783,7 @@ void Deoptimizer::DoComputeCompiledStubFrame(TranslationIterator* iterator, |
DCHECK(trampoline != NULL); |
output_frame->SetPc(reinterpret_cast<intptr_t>( |
trampoline->instruction_start())); |
- if (FLAG_enable_ool_constant_pool) { |
+ if (FLAG_enable_embedded_constant_pool) { |
Register constant_pool_reg = |
StubFailureTrampolineFrame::constant_pool_pointer_register(); |
intptr_t constant_pool_value = |