r209764 - Debug Info: Fix the source range for IfStmt's ConditionScope.

[Adrian Prantl]

Author: adrian
Date: Wed May 28 14:10:59 2014
New Revision: 209764

URL: http://llvm.org/viewvc/llvm-project?rev=209764&view=rev
Log:
Debug Info: Fix the source range for IfStmt's ConditionScope.
Since the continuation block of the if statement is emitted within the
condition scope this had the undesirable effect of creating a line table
entry at the end of the then or else statement, a line that may have never
been executed.
PR19864 / rdar://problem/17052973

Added:
    cfe/trunk/test/CodeGenCXX/debug-info-line-if.cpp
Modified:
    cfe/trunk/lib/CodeGen/CGStmt.cpp

Modified: cfe/trunk/lib/CodeGen/CGStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmt.cpp?rev=209764&r1=209763&r2=209764&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGStmt.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGStmt.cpp Wed May 28 14:10:59 2014
@@ -436,7 +436,7 @@ void CodeGenFunction::EmitIndirectGotoSt
 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.
-  LexicalScope ConditionScope(*this, S.getSourceRange());
+  LexicalScope ConditionScope(*this, S.getCond()->getSourceRange());
   RegionCounter Cnt = getPGORegionCounter(&S);
 
   if (S.getConditionVariable())

Added: cfe/trunk/test/CodeGenCXX/debug-info-line-if.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-line-if.cpp?rev=209764&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/debug-info-line-if.cpp (added)
+++ cfe/trunk/test/CodeGenCXX/debug-info-line-if.cpp Wed May 28 14:10:59 2014
@@ -0,0 +1,20 @@
+// RUN: %clang -g -std=c++11 -S -emit-llvm %s -o - | FileCheck %s
+// PR19864
+int main() {
+    int v[] = {13, 21, 8, 3, 34, 1, 5, 2};
+    int a = 0, b = 0;
+    for (int x : v)
+      if (x >= 3)
+        ++b;     // CHECK: add nsw{{.*}}, 1
+      else if (x >= 0)
+        ++a;    // CHECK: add nsw{{.*}}, 1
+    // The continuation block if the if statement should not share the
+    // location of the ++a statement. Having it point to the end of
+    // the condition is not ideal either, but it's less missleading.
+
+    // CHECK: br label
+    // CHECK: br label
+    // CHECK: br label {{.*}}, !dbg ![[DBG:.*]]
+    // CHECK: ![[DBG]] = metadata !{i32 [[@LINE-11]], i32 0, metadata !{{.*}}, null}
+
+}