Out-of-line constant pool on Arm: Stage 3 - Set Constant Pool Pointer on Function Entry

src/arm/codegen-arm.cc

Index: src/arm/codegen-arm.cc
diff --git a/src/arm/codegen-arm.cc b/src/arm/codegen-arm.cc
index 238d34ed27e3bb6bdba2d7582652c2747cead720..e61c8291ac29aea518f51b0d513e11cd52219b78 100644
--- a/src/arm/codegen-arm.cc
+++ b/src/arm/codegen-arm.cc
@@ -849,8 +849,13 @@ static byte* GetNoCodeAgeSequence(uint32_t* length) {
   if (!initialized) {
     CodePatcher patcher(byte_sequence, kNoCodeAgeSequenceLength);
     PredictableCodeSizeScope scope(patcher.masm(), *length);
-    patcher.masm()->stm(db_w, sp, r1.bit() | cp.bit() | fp.bit() | lr.bit());
-    patcher.masm()->nop(ip.code());
+    patcher.masm()->PushFixedFrame(r1);
+    if (FLAG_enable_ool_constant_pool) {
+      patcher.masm()->ldr(pp, FieldMemOperand(r1,
+                                              JSFunction::kConstantPoolOffset));
+    } else {
+      patcher.masm()->nop(ip.code());
+    }
     patcher.masm()->add(fp, sp,
                         Operand(StandardFrameConstants::kFixedFrameSizeFromFp));
     initialized = true;