| Index: src/arm/frames-arm.cc
|
| diff --git a/src/arm/frames-arm.cc b/src/arm/frames-arm.cc
|
| index 3f3c4f04c21def897eeee0c8c07a606c2e5760cd..af33c7593263ab769ddaace8e2434b6e8ddbf666 100644
|
| --- a/src/arm/frames-arm.cc
|
| +++ b/src/arm/frames-arm.cc
|
| @@ -21,7 +21,7 @@
|
| Register JavaScriptFrame::fp_register() { return v8::internal::fp; }
|
| Register JavaScriptFrame::context_register() { return cp; }
|
| Register JavaScriptFrame::constant_pool_pointer_register() {
|
| - DCHECK(FLAG_enable_embedded_constant_pool);
|
| + DCHECK(FLAG_enable_ool_constant_pool);
|
| return pp;
|
| }
|
|
|
| @@ -29,8 +29,15 @@
|
| Register StubFailureTrampolineFrame::fp_register() { return v8::internal::fp; }
|
| Register StubFailureTrampolineFrame::context_register() { return cp; }
|
| Register StubFailureTrampolineFrame::constant_pool_pointer_register() {
|
| - DCHECK(FLAG_enable_embedded_constant_pool);
|
| + DCHECK(FLAG_enable_ool_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);
|
| }
|
|
|
|
|
|
|