Index: lib/MC/MCDwarf.cpp
===================================================================
--- lib/MC/MCDwarf.cpp
+++ lib/MC/MCDwarf.cpp
@@ -1270,6 +1270,8 @@
 
   // Version
   if (verboseAsm) streamer.AddComment("DW_CIE_VERSION");
+  // For DWARF2, we use CIE version 1
+  // For DWARF3+, we use CIE version 3
   uint8_t CIEVersion = context.getDwarfVersion() <= 2 ? 1 : 3;
   streamer.EmitIntValue(CIEVersion, 1);
 
@@ -1303,9 +1305,10 @@
     assert(MRI->getRARegister() <= 255 &&
            "DWARF 2 encodes return_address_register in one byte");
     streamer.EmitIntValue(MRI->getDwarfRegNum(MRI->getRARegister(), true), 1);
-  } else
+  } else {
     streamer.EmitULEB128IntValue(
         MRI->getDwarfRegNum(MRI->getRARegister(), true));
+  }
 
   // Augmentation Data Length (optional)