Fix frame pointer loads/stores in the ARM integrated assembler.

src/IceAssemblerARM32.h

Index: src/IceAssemblerARM32.h
diff --git a/src/IceAssemblerARM32.h b/src/IceAssemblerARM32.h
index a7f8c201de1bb81f68a0076b38010dde9e04a017..984b9651d35979935b91c2576c539af1717329b4 100644
--- a/src/IceAssemblerARM32.h
+++ b/src/IceAssemblerARM32.h
@@ -59,6 +59,24 @@ class AssemblerARM32 : public Assembler {
   AssemblerARM32 &operator=(const AssemblerARM32 &) = delete;
 
 public:
+  class TargetInfo {
+    TargetInfo(const TargetInfo &) = delete;
+    TargetInfo &operator=(const TargetInfo &) = delete;
+
+  public:
+    TargetInfo(bool HasFramePointer, SizeT FrameOrStackReg,
+               int32_t StackAdjustment)
+        : HasFramePointer(HasFramePointer), FrameOrStackReg(FrameOrStackReg),
+          StackAdjustment(StackAdjustment) {}
+    explicit TargetInfo(const TargetLowering *Target)
+        : HasFramePointer(Target->hasFramePointer()),
+          FrameOrStackReg(Target->getFrameOrStackReg()),
+          StackAdjustment(Target->getStackAdjustment()) {}
+    const bool HasFramePointer;
+    const SizeT FrameOrStackReg;
+    const int32_t StackAdjustment;
+  };
+
   explicit AssemblerARM32(bool use_far_branches = false)
       : Assembler(Asm_ARM32) {
     // TODO(kschimpf): Add mode if needed when branches are handled.
@@ -172,7 +190,14 @@ public:
   void eor(const Operand *OpRd, const Operand *OpRn, const Operand *OpSrc1,
            bool SetFlags, CondARM32::Cond Cond);
 
-  void ldr(const Operand *OpRt, const Operand *OpAddress, CondARM32::Cond Cond);
+  void ldr(const Operand *OpRt, const Operand *OpAddress, CondARM32::Cond Cond,
+           const TargetInfo &Target);
+
+  void ldr(const Operand *OpRt, const Operand *OpAddress, CondARM32::Cond Cond,
+           const TargetLowering *Lowering) {
+    TargetInfo Target(Lowering);
+    ldr(OpRt, OpAddress, Cond, Target);
+  }
 
   void mov(const Operand *OpRd, const Operand *OpSrc, CondARM32::Cond Cond);
 
@@ -200,7 +225,14 @@ public:
   void sdiv(const Operand *OpRd, const Operand *OpRn, const Operand *OpSrc1,
             CondARM32::Cond Cond);
 
-  void str(const Operand *OpRt, const Operand *OpAddress, CondARM32::Cond Cond);
+  void str(const Operand *OpRt, const Operand *OpAddress, CondARM32::Cond Cond,
+           const TargetInfo &Target);
+
+  void str(const Operand *OpRt, const Operand *OpAddress, CondARM32::Cond Cond,
+           const TargetLowering *Lowering) {
+    TargetInfo Target(Lowering);
+    str(OpRt, OpAddress, Cond, Target);
+  }
 
   void sub(const Operand *OpRd, const Operand *OpRn, const Operand *OpSrc1,
            bool SetFlags, CondARM32::Cond Cond);