fix body-with-cfg br atom, in line with for loop patch

Author: OCHyams

clang/lib/CodeGen/CGStmt.cpp

@@ -1516,6 +1516,10 @@ CodeGenFunction::EmitCXXForRangeStmt(const CXXForRangeStmt &S,
     EmitStmt(S.getBody());
   }
 
+  // The last block in the loop's body (which unconditionally branches to theAdd commentMore actions
+  // `inc` block if there is one).
+  auto *FinalBodyBB = Builder.GetInsertBlock();
+
   EmitStopPoint(&S);
   // If there is an increment, emit it next.
   EmitBlock(Continue.getBlock());
@@ -1542,7 +1546,7 @@ CodeGenFunction::EmitCXXForRangeStmt(const CXXForRangeStmt &S,
 
   // We want the for closing brace to be step-able on to match existing
   // behaviour.
-  addInstToNewSourceAtom(ForBody->getTerminator(), nullptr);
+  addInstToNewSourceAtom(FinalBodyBB->getTerminator(), nullptr);
 }
 
 void CodeGenFunction::EmitReturnOfRValue(RValue RV, QualType Ty) {

clang/test/DebugInfo/KeyInstructions/for-range.cpp

@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -triple x86_64-linux-gnu  -gkey-instructions %s -debug-info-kind=line-tables-only -emit-llvm -o - \
-// RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank
+// RUN: | FileCheck %s
 
 // Perennial question: should the inc be its own source atom or not
 // (currently it is).
@@ -51,9 +51,22 @@ struct Range {
 // CHECK-NEXT:    ret void, !dbg [[DBG30:![0-9]+]]
 //
 void a() {
-    for (int i: r)
-        ;
+  for (int i: r)
+    ;
 }
+
+// - Check the branch out of the body gets an atom group (and gets it correct
+// if there's ctrl-flow in the body).
+void b() {
+  for (int i: r) {
+    if (i)
+      ;
+// CHECK: entry:
+// CHECK: if.end:
+// CHECK-NEXT: br label %for.inc, !dbg [[b_br:!.*]]
+  }
+}
+
 //.
 // CHECK: [[DBG14]] = !DILocation({{.*}}, atomGroup: 1, atomRank: 1)
 // CHECK: [[DBG15]] = !DILocation({{.*}}, atomGroup: 2, atomRank: 2)
@@ -69,4 +82,6 @@ void a() {
 // CHECK: [[DBG25]] = !DILocation({{.*}}, atomGroup: 7, atomRank: 2)
 // CHECK: [[DBG26]] = !DILocation({{.*}}, atomGroup: 7, atomRank: 1)
 // CHECK: [[DBG30]] = !DILocation({{.*}})
+//
+// CHECK: [[b_br]] = !DILocation({{.*}}, atomGroup: [[#]], atomRank: [[#]])
 //.