diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index 40518eb2093..1c33cd85f1e 100644
--- a/lib/CodeGen/DwarfWriter.cpp
+++ b/lib/CodeGen/DwarfWriter.cpp
@@ -1862,9 +1862,10 @@ private:
       unsigned StartID = Scope->getStartLabelID();
       unsigned EndID = Scope->getEndLabelID();
       
-      // Throw out scope if block is discarded.
-      if (StartID && !DebugInfo->isLabelValid(StartID)) continue;
-      if (EndID && !DebugInfo->isLabelValid(EndID)) continue;
+      // Widen scope if label is discarded.
+      // FIXME - really need to find a GOOD label if a block is dead.
+      if (StartID && !DebugInfo->isLabelValid(StartID)) StartID = 0;
+      if (EndID && !DebugInfo->isLabelValid(EndID)) EndID = 0;
       
       DIE *ScopeDie = new DIE(DW_TAG_lexical_block);