Index: source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
===================================================================
--- source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -330,17 +330,11 @@
 
   int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) override { return 0; }
 
-  int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override {
-    return 0;
-  }
+  int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr) override { return 0; }
 
-  int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override {
-    return 0;
-  }
+  int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu) override { return 0; }
 
-  int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override {
-    return 0;
-  }
+  int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc) override { return 0; }
 };
 
 class RegisterContextDarwin_i386_Mach : public RegisterContextDarwin_i386 {
@@ -473,17 +467,11 @@
 
   int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) override { return 0; }
 
-  int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override {
-    return 0;
-  }
+  int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr) override { return 0; }
 
-  int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override {
-    return 0;
-  }
+  int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu) override { return 0; }
 
-  int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override {
-    return 0;
-  }
+  int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc) override { return 0; }
 };
 
 class RegisterContextDarwin_arm_Mach : public RegisterContextDarwin_arm {
@@ -628,21 +616,13 @@
 
   int DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg) override { return -1; }
 
-  int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override {
-    return 0;
-  }
+  int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr) override { return 0; }
 
-  int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override {
-    return 0;
-  }
+  int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu) override { return 0; }
 
-  int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override {
-    return 0;
-  }
+  int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc) override { return 0; }
 
-  int DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg) override {
-    return -1;
-  }
+  int DoWriteDBG(lldb::tid_t tid, int flavor, DBG &dbg) override { return -1; }
 };
 
 class RegisterContextDarwin_arm64_Mach : public RegisterContextDarwin_arm64 {
@@ -800,21 +780,13 @@
 
   int DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg) override { return -1; }
 
-  int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override {
-    return 0;
-  }
+  int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr) override { return 0; }
 
-  int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override {
-    return 0;
-  }
+  int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu) override { return 0; }
 
-  int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override {
-    return 0;
-  }
+  int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc) override { return 0; }
 
-  int DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg) override {
-    return -1;
-  }
+  int DoWriteDBG(lldb::tid_t tid, int flavor, DBG &dbg) override { return -1; }
 };
 
 static uint32_t MachHeaderSizeFromMagic(uint32_t magic) {
Index: source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm.h
===================================================================
--- source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm.h
+++ source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm.h
@@ -34,13 +34,13 @@
 
   int DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg);
 
-  int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
+  int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr);
 
-  int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
+  int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu);
 
-  int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
+  int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc);
 
-  int DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg);
+  int DoWriteDBG(lldb::tid_t tid, int flavor, DBG &dbg);
 
   ThreadKDP &m_kdp_thread;
 };
Index: source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm.cpp
===================================================================
--- source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm.cpp
+++ source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm.cpp
@@ -86,8 +86,7 @@
   return -1;
 }
 
-int RegisterContextKDP_arm::DoWriteGPR(lldb::tid_t tid, int flavor,
-                                       const GPR &gpr) {
+int RegisterContextKDP_arm::DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
@@ -102,8 +101,7 @@
   return -1;
 }
 
-int RegisterContextKDP_arm::DoWriteFPU(lldb::tid_t tid, int flavor,
-                                       const FPU &fpu) {
+int RegisterContextKDP_arm::DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
@@ -118,8 +116,7 @@
   return -1;
 }
 
-int RegisterContextKDP_arm::DoWriteEXC(lldb::tid_t tid, int flavor,
-                                       const EXC &exc) {
+int RegisterContextKDP_arm::DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
@@ -134,8 +131,7 @@
   return -1;
 }
 
-int RegisterContextKDP_arm::DoWriteDBG(lldb::tid_t tid, int flavor,
-                                       const DBG &dbg) {
+int RegisterContextKDP_arm::DoWriteDBG(lldb::tid_t tid, int flavor, DBG &dbg) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
Index: source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm64.h
===================================================================
--- source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm64.h
+++ source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm64.h
@@ -35,13 +35,13 @@
 
   int DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg);
 
-  int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
+  int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr);
 
-  int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
+  int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu);
 
-  int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
+  int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc);
 
-  int DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg);
+  int DoWriteDBG(lldb::tid_t tid, int flavor, DBG &dbg);
 
   ThreadKDP &m_kdp_thread;
 };
Index: source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm64.cpp
===================================================================
--- source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm64.cpp
+++ source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm64.cpp
@@ -88,7 +88,7 @@
 }
 
 int RegisterContextKDP_arm64::DoWriteGPR(lldb::tid_t tid, int flavor,
-                                         const GPR &gpr) {
+                                         GPR &gpr) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
@@ -104,7 +104,7 @@
 }
 
 int RegisterContextKDP_arm64::DoWriteFPU(lldb::tid_t tid, int flavor,
-                                         const FPU &fpu) {
+                                         FPU &fpu) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
@@ -120,7 +120,7 @@
 }
 
 int RegisterContextKDP_arm64::DoWriteEXC(lldb::tid_t tid, int flavor,
-                                         const EXC &exc) {
+                                         EXC &exc) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
@@ -136,7 +136,7 @@
 }
 
 int RegisterContextKDP_arm64::DoWriteDBG(lldb::tid_t tid, int flavor,
-                                         const DBG &dbg) {
+                                         DBG &dbg) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
Index: source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_i386.h
===================================================================
--- source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_i386.h
+++ source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_i386.h
@@ -31,11 +31,11 @@
 
   int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc);
 
-  int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
+  int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr);
 
-  int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
+  int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu);
 
-  int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
+  int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc);
 
   ThreadKDP &m_kdp_thread;
 };
Index: source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_i386.cpp
===================================================================
--- source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_i386.cpp
+++ source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_i386.cpp
@@ -71,7 +71,7 @@
 }
 
 int RegisterContextKDP_i386::DoWriteGPR(lldb::tid_t tid, int flavor,
-                                        const GPR &gpr) {
+                                        GPR &gpr) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
@@ -87,7 +87,7 @@
 }
 
 int RegisterContextKDP_i386::DoWriteFPU(lldb::tid_t tid, int flavor,
-                                        const FPU &fpu) {
+                                        FPU &fpu) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
@@ -103,7 +103,7 @@
 }
 
 int RegisterContextKDP_i386::DoWriteEXC(lldb::tid_t tid, int flavor,
-                                        const EXC &exc) {
+                                        EXC &exc) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
Index: source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_x86_64.h
===================================================================
--- source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_x86_64.h
+++ source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_x86_64.h
@@ -31,11 +31,11 @@
 
   int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc);
 
-  int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
+  int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr);
 
-  int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
+  int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu);
 
-  int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
+  int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc);
 
   ThreadKDP &m_kdp_thread;
 };
Index: source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_x86_64.cpp
===================================================================
--- source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_x86_64.cpp
+++ source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_x86_64.cpp
@@ -74,7 +74,7 @@
 }
 
 int RegisterContextKDP_x86_64::DoWriteGPR(lldb::tid_t tid, int flavor,
-                                          const GPR &gpr) {
+                                          GPR &gpr) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
@@ -90,7 +90,7 @@
 }
 
 int RegisterContextKDP_x86_64::DoWriteFPU(lldb::tid_t tid, int flavor,
-                                          const FPU &fpu) {
+                                          FPU &fpu) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
@@ -106,7 +106,7 @@
 }
 
 int RegisterContextKDP_x86_64::DoWriteEXC(lldb::tid_t tid, int flavor,
-                                          const EXC &exc) {
+                                          EXC &exc) {
   ProcessSP process_sp(CalculateProcess());
   if (process_sp) {
     Status error;
Index: source/Plugins/Process/Utility/RegisterContextDarwin_arm.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextDarwin_arm.h
+++ source/Plugins/Process/Utility/RegisterContextDarwin_arm.h
@@ -245,13 +245,13 @@
 
   virtual int DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg) = 0;
 
-  virtual int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) = 0;
+  virtual int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr) = 0;
 
-  virtual int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) = 0;
+  virtual int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu) = 0;
 
-  virtual int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) = 0;
+  virtual int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc) = 0;
 
-  virtual int DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg) = 0;
+  virtual int DoWriteDBG(lldb::tid_t tid, int flavor, DBG &dbg) = 0;
 
   int ReadRegisterSet(uint32_t set, bool force);
 
Index: source/Plugins/Process/Utility/RegisterContextDarwin_arm64.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextDarwin_arm64.h
+++ source/Plugins/Process/Utility/RegisterContextDarwin_arm64.h
@@ -212,13 +212,13 @@
 
   virtual int DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg) = 0;
 
-  virtual int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) = 0;
+  virtual int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr) = 0;
 
-  virtual int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) = 0;
+  virtual int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu) = 0;
 
-  virtual int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) = 0;
+  virtual int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc) = 0;
 
-  virtual int DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg) = 0;
+  virtual int DoWriteDBG(lldb::tid_t tid, int flavor, DBG &dbg) = 0;
 
   int ReadRegisterSet(uint32_t set, bool force);
 
Index: source/Plugins/Process/Utility/RegisterContextDarwin_i386.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextDarwin_i386.h
+++ source/Plugins/Process/Utility/RegisterContextDarwin_i386.h
@@ -191,11 +191,11 @@
 
   virtual int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) = 0;
 
-  virtual int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) = 0;
+  virtual int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr) = 0;
 
-  virtual int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) = 0;
+  virtual int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu) = 0;
 
-  virtual int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) = 0;
+  virtual int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc) = 0;
 
   int ReadRegisterSet(uint32_t set, bool force);
 
Index: source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.h
+++ source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.h
@@ -196,11 +196,11 @@
 
   virtual int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) = 0;
 
-  virtual int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) = 0;
+  virtual int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr) = 0;
 
-  virtual int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) = 0;
+  virtual int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu) = 0;
 
-  virtual int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) = 0;
+  virtual int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc) = 0;
 
   int ReadRegisterSet(uint32_t set, bool force);
 
Index: source/Plugins/Process/Utility/RegisterContextMach_arm.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextMach_arm.h
+++ source/Plugins/Process/Utility/RegisterContextMach_arm.h
@@ -33,13 +33,13 @@
 
   int DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg);
 
-  int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
+  int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr);
 
-  int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
+  int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu);
 
-  int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
+  int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc);
 
-  int DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg);
+  int DoWriteDBG(lldb::tid_t tid, int flavor, DBG &dbg);
 };
 
 #endif // liblldb_RegisterContextMach_arm_h_
Index: source/Plugins/Process/Utility/RegisterContextMach_arm.cpp
===================================================================
--- source/Plugins/Process/Utility/RegisterContextMach_arm.cpp
+++ source/Plugins/Process/Utility/RegisterContextMach_arm.cpp
@@ -48,23 +48,19 @@
   return ::thread_get_state(tid, flavor, (thread_state_t)&dbg, &count);
 }
 
-int RegisterContextMach_arm::DoWriteGPR(lldb::tid_t tid, int flavor,
-                                        const GPR &gpr) {
+int RegisterContextMach_arm::DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr) {
   return ::thread_set_state(tid, flavor, (thread_state_t)&gpr, GPRWordCount);
 }
 
-int RegisterContextMach_arm::DoWriteFPU(lldb::tid_t tid, int flavor,
-                                        const FPU &fpu) {
+int RegisterContextMach_arm::DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu) {
   return ::thread_set_state(tid, flavor, (thread_state_t)&fpu, FPUWordCount);
 }
 
-int RegisterContextMach_arm::DoWriteEXC(lldb::tid_t tid, int flavor,
-                                        const EXC &exc) {
+int RegisterContextMach_arm::DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc) {
   return ::thread_set_state(tid, flavor, (thread_state_t)&exc, EXCWordCount);
 }
 
-int RegisterContextMach_arm::DoWriteDBG(lldb::tid_t tid, int flavor,
-                                        const DBG &dbg) {
+int RegisterContextMach_arm::DoWriteDBG(lldb::tid_t tid, int flavor, DBG &dbg) {
   return ::thread_set_state(tid, flavor, (thread_state_t)&dbg, DBGWordCount);
 }
 
Index: source/Plugins/Process/Utility/RegisterContextMach_i386.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextMach_i386.h
+++ source/Plugins/Process/Utility/RegisterContextMach_i386.h
@@ -30,11 +30,11 @@
 
   int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc);
 
-  int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
+  int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr);
 
-  int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
+  int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu);
 
-  int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
+  int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc);
 };
 
 #endif // liblldb_RegisterContextMach_i386_h_
Index: source/Plugins/Process/Utility/RegisterContextMach_i386.cpp
===================================================================
--- source/Plugins/Process/Utility/RegisterContextMach_i386.cpp
+++ source/Plugins/Process/Utility/RegisterContextMach_i386.cpp
@@ -42,17 +42,17 @@
 }
 
 int RegisterContextMach_i386::DoWriteGPR(lldb::tid_t tid, int flavor,
-                                         const GPR &gpr) {
+                                         GPR &gpr) {
   return ::thread_set_state(tid, flavor, (thread_state_t)&gpr, GPRWordCount);
 }
 
 int RegisterContextMach_i386::DoWriteFPU(lldb::tid_t tid, int flavor,
-                                         const FPU &fpu) {
+                                         FPU &fpu) {
   return ::thread_set_state(tid, flavor, (thread_state_t)&fpu, FPUWordCount);
 }
 
 int RegisterContextMach_i386::DoWriteEXC(lldb::tid_t tid, int flavor,
-                                         const EXC &exc) {
+                                         EXC &exc) {
   return ::thread_set_state(tid, flavor, (thread_state_t)&exc, EXCWordCount);
 }
 
Index: source/Plugins/Process/Utility/RegisterContextMach_x86_64.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextMach_x86_64.h
+++ source/Plugins/Process/Utility/RegisterContextMach_x86_64.h
@@ -31,11 +31,11 @@
 
   int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc);
 
-  int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
+  int DoWriteGPR(lldb::tid_t tid, int flavor, GPR &gpr);
 
-  int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
+  int DoWriteFPU(lldb::tid_t tid, int flavor, FPU &fpu);
 
-  int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
+  int DoWriteEXC(lldb::tid_t tid, int flavor, EXC &exc);
 };
 
 #endif // liblldb_RegisterContextMach_x86_64_h_
Index: source/Plugins/Process/Utility/RegisterContextMach_x86_64.cpp
===================================================================
--- source/Plugins/Process/Utility/RegisterContextMach_x86_64.cpp
+++ source/Plugins/Process/Utility/RegisterContextMach_x86_64.cpp
@@ -45,17 +45,17 @@
 }
 
 int RegisterContextMach_x86_64::DoWriteGPR(lldb::tid_t tid, int flavor,
-                                           const GPR &gpr) {
+                                           GPR &gpr) {
   return ::thread_set_state(tid, flavor, (thread_state_t)&gpr, GPRWordCount);
 }
 
 int RegisterContextMach_x86_64::DoWriteFPU(lldb::tid_t tid, int flavor,
-                                           const FPU &fpu) {
+                                           FPU &fpu) {
   return ::thread_set_state(tid, flavor, (thread_state_t)&fpu, FPUWordCount);
 }
 
 int RegisterContextMach_x86_64::DoWriteEXC(lldb::tid_t tid, int flavor,
-                                           const EXC &exc) {
+                                           EXC &exc) {
   return ::thread_set_state(tid, flavor, (thread_state_t)&exc, EXCWordCount);
 }