3 files changed, 8 insertions, 7 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc
index e434e9e7ef..332c99ae64 100644
--- a/compiler/optimizing/code_generator_arm.cc
+++ b/compiler/optimizing/code_generator_arm.cc
@@ -514,11 +514,11 @@ void CodeGeneratorARM::ComputeSpillMask() {
 }
 
 static dwarf::Reg DWARFReg(Register reg) {
-    return dwarf::Reg::ArmCore(static_cast<int>(reg));
+  return dwarf::Reg::ArmCore(static_cast<int>(reg));
 }
 
 static dwarf::Reg DWARFReg(SRegister reg) {
-    return dwarf::Reg::ArmFp(static_cast<int>(reg));
+  return dwarf::Reg::ArmFp(static_cast<int>(reg));
 }
 
 void CodeGeneratorARM::GenerateFrameEntry() {
@@ -542,12 +542,12 @@ void CodeGeneratorARM::GenerateFrameEntry() {
   uint32_t push_mask = (core_spill_mask_ & (~(1 << PC))) | 1 << LR;
   __ PushList(push_mask);
   __ cfi().AdjustCFAOffset(kArmWordSize * POPCOUNT(push_mask));
-  __ cfi().RelOffsetForMany(DWARFReg(Register(0)), 0, push_mask, kArmWordSize);
+  __ cfi().RelOffsetForMany(DWARFReg(R0), 0, push_mask, kArmWordSize);
   if (fpu_spill_mask_ != 0) {
     SRegister start_register = SRegister(LeastSignificantBit(fpu_spill_mask_));
     __ vpushs(start_register, POPCOUNT(fpu_spill_mask_));
     __ cfi().AdjustCFAOffset(kArmWordSize * POPCOUNT(fpu_spill_mask_));
-    __ cfi().RelOffsetForMany(DWARFReg(SRegister(0)), 0, fpu_spill_mask_, kArmWordSize);
+    __ cfi().RelOffsetForMany(DWARFReg(S0), 0, fpu_spill_mask_, kArmWordSize);
   }
   int adjust = GetFrameSize() - FrameEntrySpillSize();
   __ AddConstant(SP, -adjust);
diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index 637064d101..38f9ef8efe 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -461,7 +461,7 @@ InstructionCodeGeneratorX86::InstructionCodeGeneratorX86(HGraph* graph, CodeGene
         codegen_(codegen) {}
 
 static dwarf::Reg DWARFReg(Register reg) {
-    return dwarf::Reg::X86Core(static_cast<int>(reg));
+  return dwarf::Reg::X86Core(static_cast<int>(reg));
 }
 
 void CodeGeneratorX86::GenerateFrameEntry() {
diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc
index 0cb35d2b88..7a928d4d7d 100644
--- a/compiler/optimizing/code_generator_x86_64.cc
+++ b/compiler/optimizing/code_generator_x86_64.cc
@@ -484,10 +484,11 @@ void CodeGeneratorX86_64::SetupBlockedRegisters(bool is_baseline) const {
 }
 
 static dwarf::Reg DWARFReg(Register reg) {
-    return dwarf::Reg::X86_64Core(static_cast<int>(reg));
+  return dwarf::Reg::X86_64Core(static_cast<int>(reg));
 }
+
 static dwarf::Reg DWARFReg(FloatRegister reg) {
-    return dwarf::Reg::X86_64Fp(static_cast<int>(reg));
+  return dwarf::Reg::X86_64Fp(static_cast<int>(reg));
 }
 
 void CodeGeneratorX86_64::GenerateFrameEntry() {