| Index: src/arm/frames-arm.cc
|
| diff --git a/src/arm/frames-arm.cc b/src/arm/frames-arm.cc
|
| index fde4a17749259ca0f83f6a580f40101d7ad73f88..74cf7849dec684390b3c49919e7059b49f3c6314 100644
|
| --- a/src/arm/frames-arm.cc
|
| +++ b/src/arm/frames-arm.cc
|
| @@ -21,7 +21,7 @@ namespace internal {
|
| Register JavaScriptFrame::fp_register() { return v8::internal::fp; }
|
| Register JavaScriptFrame::context_register() { return cp; }
|
| Register JavaScriptFrame::constant_pool_pointer_register() {
|
| - DCHECK(FLAG_enable_ool_constant_pool);
|
| + DCHECK(FLAG_enable_embedded_constant_pool);
|
| return pp;
|
| }
|
|
|
| @@ -29,18 +29,11 @@ Register JavaScriptFrame::constant_pool_pointer_register() {
|
| Register StubFailureTrampolineFrame::fp_register() { return v8::internal::fp; }
|
| Register StubFailureTrampolineFrame::context_register() { return cp; }
|
| Register StubFailureTrampolineFrame::constant_pool_pointer_register() {
|
| - DCHECK(FLAG_enable_ool_constant_pool);
|
| + DCHECK(FLAG_enable_embedded_constant_pool);
|
| return pp;
|
| }
|
|
|
|
|
| -Object*& ExitFrame::constant_pool_slot() const {
|
| - DCHECK(FLAG_enable_ool_constant_pool);
|
| - const int offset = ExitFrameConstants::kConstantPoolOffset;
|
| - return Memory::Object_at(fp() + offset);
|
| -}
|
| -
|
| -
|
| } } // namespace v8::internal
|
|
|
| #endif // V8_TARGET_ARCH_ARM
|
|
|