diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index 52b405cda1a..73ec4efba78 100644
--- a/lib/CodeGen/DwarfWriter.cpp
+++ b/lib/CodeGen/DwarfWriter.cpp
@@ -2948,7 +2948,7 @@ private:
       } else {
         // Gather the action sizes
         for (unsigned j = 0, M = TypeIds.size(); j != M; ++j) {
-          unsigned TypeID = TypeIds[i];
+          unsigned TypeID = TypeIds[j];
           unsigned SizeTypeID = Asm->SizeSLEB128(TypeID);
           signed Action = j ? -(SizeAction + SizeTypeID) : 0;
           SizeAction = SizeTypeID + Asm->SizeSLEB128(Action);