diff --git a/lib/CodeGen/AsmPrinter/DwarfWriter.cpp b/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
index bfac3b68ae1..b454cd09fb8 100644
--- a/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
@@ -2099,29 +2099,28 @@ private:
           AddUInt(ScopeDie, DW_AT_call_file, 0, Scope->getFile());
           AddUInt(ScopeDie, DW_AT_call_line, 0, Scope->getLine());
           AddUInt(ScopeDie, DW_AT_call_column, 0, Scope->getColumn());
-        }
-        else
+        } else {
           ScopeDie = new DIE(DW_TAG_lexical_block);
-          
-          // Add the scope bounds.
-          if (StartID) {
-            AddLabel(ScopeDie, DW_AT_low_pc, DW_FORM_addr,
-                     DWLabel("label", StartID));
-          } else {
-            AddLabel(ScopeDie, DW_AT_low_pc, DW_FORM_addr,
-                     DWLabel("func_begin", SubprogramCount));
-          }
-          if (EndID) {
-            AddLabel(ScopeDie, DW_AT_high_pc, DW_FORM_addr,
-                     DWLabel("label", EndID));
-          } else {
-            AddLabel(ScopeDie, DW_AT_high_pc, DW_FORM_addr,
-                     DWLabel("func_end", SubprogramCount));
-          }
-          
-          // Add the scope contents.
-          ConstructDbgScope(Scope, StartID, EndID, ScopeDie, Unit);
-          ParentDie->AddChild(ScopeDie);
+        }
+
+        // Add the scope bounds.
+        if (StartID)
+          AddLabel(ScopeDie, DW_AT_low_pc, DW_FORM_addr,
+                   DWLabel("label", StartID));
+        else
+          AddLabel(ScopeDie, DW_AT_low_pc, DW_FORM_addr,
+                   DWLabel("func_begin", SubprogramCount));
+
+        if (EndID)
+          AddLabel(ScopeDie, DW_AT_high_pc, DW_FORM_addr,
+                   DWLabel("label", EndID));
+        else
+          AddLabel(ScopeDie, DW_AT_high_pc, DW_FORM_addr,
+                   DWLabel("func_end", SubprogramCount));
+
+        // Add the scope contents.
+        ConstructDbgScope(Scope, StartID, EndID, ScopeDie, Unit);
+        ParentDie->AddChild(ScopeDie);
       }
     }
   }