style nits

Author: OCHyams

clang/lib/CodeGen/CGStmt.cpp

@@ -1488,8 +1488,8 @@ CodeGenFunction::EmitCXXForRangeStmt(const CXXForRangeStmt &S,
   // match existing loop stepping behaviour. FIXME: We could have the branch as
   // the backup location for the condition, which would probably be a better
   // experience.
-  if (auto *I = dyn_cast<llvm::Instruction>(BoolCondVal))
-    addInstToNewSourceAtom(I, nullptr);
+  if (auto *CondI = dyn_cast<llvm::Instruction>(BoolCondVal))
+    addInstToNewSourceAtom(CondI, nullptr);
   addInstToNewSourceAtom(I, nullptr);
 
   if (ExitBlock != LoopExit.getBlock()) {

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

@@ -1,14 +1,15 @@
-// RUN: %clang_cc1 -gkey-instructions %s -debug-info-kind=line-tables-only -emit-llvm -o - \
+// 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
 
-// Perennial quesiton: should the inc be its own source atom or not
+// Perennial question: should the inc be its own source atom or not
 // (currently it is).
 
 // FIXME: See do.c and while.c regarding cmp and cond br groups.
 
 // The stores in the setup (stores to __RANGE1, __BEGIN1, __END1) are all
 // marked as Key. Unclear whether that's desirable. Keep for now as that's
-// least risky.
+// least risky (at worst it introduces an unecessary step while debugging,
+// as opposed to potentially losing one we want).
 
 // Check the conditional branch (and the condition) in FOR_COND and
 // unconditional branch in FOR_BODY are Key Instructions.