commit 7b309b0107093d0d2b4df2ce1deddd9bd4698cff
author Eric Christopher <echristo@gmail.com> Wed Jul 10 20:14:36 2013 +0000
committer Eric Christopher <echristo@gmail.com> Wed Jul 10 20:14:36 2013 +0000
tree 3aec0bd8ad502a15aad8e69bb7993e9c42e9b5db
parent 8f6134c308951a72642eebb65a44408ea1e237a8

Use a LexicalScope here since it is one and it will encapsulate
the two sets of debug scope and cleanup scope.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@186030 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGStmt.cpp

diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp
index 54abbab..8ee9197 100644
--- a/lib/CodeGen/CGStmt.cpp
+++ b/lib/CodeGen/CGStmt.cpp
@@ -425,12 +425,7 @@
 void CodeGenFunction::EmitIfStmt(const IfStmt &S) {
   // C99 6.8.4.1: The first substatement is executed if the expression compares
   // unequal to 0.  The condition must be a scalar type.
-  RunCleanupsScope ConditionScope(*this);
-
-  // Also open a debugger-visible lexical scope for the condition.
-  CGDebugInfo *DI = getDebugInfo();
-  if (DI)
-    DI->EmitLexicalBlockStart(Builder, S.getSourceRange().getBegin());
+  LexicalScope ConditionScope(*this, S.getSourceRange());
 
   if (S.getConditionVariable())
     EmitAutoVarDecl(*S.getConditionVariable());
@@ -452,8 +447,6 @@
         RunCleanupsScope ExecutedScope(*this);
         EmitStmt(Executed);
       }
-      if (DI)
-        DI->EmitLexicalBlockEnd(Builder, S.getSourceRange().getEnd());
       return;
     }
   }
@@ -491,9 +484,6 @@
     EmitBranch(ContBlock);
   }
 
-  if (DI)
-    DI->EmitLexicalBlockEnd(Builder, S.getSourceRange().getEnd());
-
   // Emit the continuation block for code after the if.
   EmitBlock(ContBlock, true);
 }
@@ -1353,7 +1343,7 @@
       break;
     case '#': // Ignore the rest of the constraint alternative.
       while (Constraint[1] && Constraint[1] != ',')
-	Constraint++;
+        Constraint++;
       break;
     case ',':
       Result += "|";