1 files changed, 2 insertions, 7 deletions
diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h
index 8740fd06df..b737a9ed7a 100644
--- a/lib/CodeGen/CodeGenFunction.h
+++ b/lib/CodeGen/CodeGenFunction.h
@@ -854,11 +854,8 @@ public:
     /// cleanups.
     ~LexicalScope() {
       if (PopDebugStack) {
-        if (CGDebugInfo *DI = CGF.getDebugInfo()) {
-          if (RunCleanupsScope::requiresCleanups())
-            DI->EmitLocation(CGF.Builder, Range.getEnd());
-          DI->EmitLexicalBlockEnd(CGF.Builder, Range.getEnd());
-        }
+        CGDebugInfo *DI = CGF.getDebugInfo();
+        if (DI) DI->EmitLexicalBlockEnd(CGF.Builder, Range.getEnd());
       }
     }
 
@@ -867,8 +864,6 @@ public:
     void ForceCleanup() {
       RunCleanupsScope::ForceCleanup();
       if (CGDebugInfo *DI = CGF.getDebugInfo()) {
-        if (RunCleanupsScope::requiresCleanups())
-          DI->EmitLocation(CGF.Builder, Range.getEnd());
         DI->EmitLexicalBlockEnd(CGF.Builder, Range.getEnd());
         PopDebugStack = false;
       }