Bug 1254808 - IonMonkey: Factor MacroAssembler::popReturnAddress on ARM. r=nbp

---
 js/src/jit/CodeGenerator.cpp              | 2 +-
 js/src/jit/MacroAssembler.h               | 1 +
 js/src/jit/arm/MacroAssembler-arm.cpp     | 6 ++++++
 js/src/jit/arm64/MacroAssembler-arm64.cpp | 6 ++++++
 4 files changed, 14 insertions(+), 1 deletion(-)

js/src/jit/CodeGenerator.cpp

@@ -6874,7 +6874,7 @@ JitRuntime::generateLazyLinkStub(JSContext* cx)
 #ifdef JS_USE_LINK_REGISTER
     // Restore the return address such that the emitPrologue function of the
     // CodeGenerator can push it back on the stack with pushReturnAddress.
-    masm.pop(lr);
+    masm.popReturnAddress();
 #endif
     masm.jump(ReturnReg);
 

js/src/jit/MacroAssembler.h

@@ -500,6 +500,7 @@ class MacroAssembler : public MacroAssemblerSpecific
     void callAndPushReturnAddress(Label* label) DEFINED_ON(mips_shared, x86_shared);
 
     void pushReturnAddress() DEFINED_ON(arm, arm64);
+    void popReturnAddress() DEFINED_ON(arm, arm64);
 
   public:
     // ===============================================================

js/src/jit/arm/MacroAssembler-arm.cpp

@@ -4853,6 +4853,12 @@ MacroAssembler::pushReturnAddress()
     push(lr);
 }
 
+void
+MacroAssembler::popReturnAddress()
+{
+    pop(lr);
+}
+
 // ===============================================================
 // ABI function calls.
 

js/src/jit/arm64/MacroAssembler-arm64.cpp

@@ -563,6 +563,12 @@ MacroAssembler::pushReturnAddress()
     push(lr);
 }
 
+void
+MacroAssembler::popReturnAddress()
+{
+    pop(lr);
+}
+
 // ===============================================================
 // ABI function calls.