llvm
diff --git a/‎clang/lib/CodeGen/CGDecl.cpp
Copy file name to clipboardExpand all lines: clang/lib/CodeGen/CGDecl.cpp
+1Lines changed: 1 addition & 0 deletions b/‎clang/lib/CodeGen/CGDecl.cpp
Copy file name to clipboardExpand all lines: clang/lib/CodeGen/CGDecl.cpp
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎clang/lib/CodeGen/CGExpr.cpp
Copy file name to clipboardExpand all lines: clang/lib/CodeGen/CGExpr.cpp
+2Lines changed: 2 additions & 0 deletions b/‎clang/lib/CodeGen/CGExpr.cpp
Copy file name to clipboardExpand all lines: clang/lib/CodeGen/CGExpr.cpp
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎clang/test/DebugInfo/KeyInstructions/init-scalar.c
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions b/‎clang/test/DebugInfo/KeyInstructions/init-scalar.c
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
@@ -1925,6 +1925,7 @@ void CodeGenFunction::EmitAutoVarInit(const AutoVarEmission &emission) {
 
   const VarDecl &D = *emission.Variable;
   auto DL = ApplyDebugLocation::CreateDefaultArtificial(*this, D.getLocation());
+  ApplyAtomGroup Grp(getDebugInfo());
   QualType type = D.getType();
 
   // If this local has an initializer, emit it now.
 
@@ -2222,6 +2222,8 @@ void CodeGenFunction::EmitStoreOfScalar(llvm::Value *Value, Address Addr,
   }
 
   llvm::StoreInst *Store = Builder.CreateStore(Value, Addr, Volatile);
+  addInstToCurrentSourceAtom(Store, Value);
+
   if (isNontemporal) {
     llvm::MDNode *Node =
         llvm::MDNode::get(Store->getContext(),
 
@@ -0,0 +1,19 @@
+// RUN: %clang -gkey-instructions -x c++ %s -gmlt -gcolumn-info -S -emit-llvm -o - \
+// RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank
+
+// RUN: %clang -gkey-instructions -x c %s -gmlt -gcolumn-info -S -emit-llvm -o - \
+// RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank
+
+void a() {
+// CHECK: store i32 0, ptr %A{{.*}}, !dbg [[G1R1:!.*]]
+    int A = 0;
+// CHECK: %add = add {{.*}}, !dbg [[G2R2:!.*]]
+// CHECK: store i32 %add, ptr %B, align 4, !dbg [[G2R1:!.*]]
+    int B = 2 * A + 1;
+// CHECK-TODO: ret{{.*}}, !dbg [[G3R1:!.*]]
+}
+
+// CHECK: [[G1R1]] = !DILocation({{.*}}, atomGroup: 1, atomRank: 1)
+// CHECK: [[G2R2]] = !DILocation({{.*}}, atomGroup: 2, atomRank: 2)
+// CHECK: [[G2R1]] = !DILocation({{.*}}, atomGroup: 2, atomRank: 1)
+// CHECK-TODO: [[G3R1]] = !DILocation({{.*}}, atomGroup: 3, atomRank: 1)
Original file line number	Diff line number	Diff line change
`@@ -2222,6 +2222,8 @@ void CodeGenFunction::EmitStoreOfScalar(llvm::Value *Value, Address Addr,`
`2222`	`2222`	`}`
`2223`	`2223`
`2224`	`2224`	`llvm::StoreInst *Store = Builder.CreateStore(Value, Addr, Volatile);`
	`2225`	`+ addInstToCurrentSourceAtom(Store, Value);`
	`2226`	`+`
`2225`	`2227`	`if (isNontemporal) {`
`2226`	`2228`	`llvm::MDNode *Node =`
`2227`	`2229`	`llvm::MDNode::get(Store->getContext(),`