Author: Orlando Cazalet-Hyams Date: 2025-05-28T11:25:41+01:00 New Revision: c4d0d95a4fb92d65594f3575814a027815b5182f
URL: https://github.com/llvm/llvm-project/commit/c4d0d95a4fb92d65594f3575814a027815b5182f DIFF: https://github.com/llvm/llvm-project/commit/c4d0d95a4fb92d65594f3575814a027815b5182f.diff LOG: [KeyInstr][Clang] Reset atomGroup number for each function (#141607) CGDebugInfo::completeFunction was added previously but mistakenly not called (dropped through the cracks while putting together the patch stack). Moved out of #134652 and #134654. This patch is part of a stack that teaches Clang to generate Key Instructions metadata for C and C++. RFC: https://discourse.llvm.org/t/rfc-improving-is-stmt-placement-for-better-interactive-debugging/82668 The feature is only functional in LLVM if LLVM is built with CMake flag LLVM_EXPERIMENTAL_KEY_INSTRUCTIONs. Eventually that flag will be removed. Added: clang/test/DebugInfo/KeyInstructions/multi-func.c Modified: clang/lib/CodeGen/CodeGenFunction.cpp Removed: ################################################################################ diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index e2357563f7d56..4193f0a1b278f 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -36,6 +36,7 @@ #include "clang/CodeGen/CGFunctionInfo.h" #include "clang/Frontend/FrontendDiagnostic.h" #include "llvm/ADT/ArrayRef.h" +#include "llvm/ADT/ScopeExit.h" #include "llvm/Frontend/OpenMP/OMPIRBuilder.h" #include "llvm/IR/DataLayout.h" #include "llvm/IR/Dominators.h" @@ -1507,6 +1508,11 @@ void CodeGenFunction::GenerateCode(GlobalDecl GD, llvm::Function *Fn, // Disable debug info indefinitely for this function DebugInfo = nullptr; } + // Finalize function debug info on exit. + auto Cleanup = llvm::make_scope_exit([this] { + if (CGDebugInfo *DI = getDebugInfo()) + DI->completeFunction(); + }); // The function might not have a body if we're generating thunks for a // function declaration. diff --git a/clang/test/DebugInfo/KeyInstructions/multi-func.c b/clang/test/DebugInfo/KeyInstructions/multi-func.c new file mode 100644 index 0000000000000..6e225eed81de8 --- /dev/null +++ b/clang/test/DebugInfo/KeyInstructions/multi-func.c @@ -0,0 +1,19 @@ +// RUN: %clang_cc1 -triple x86_64-linux-gnu -gkey-instructions -gno-column-info -x c++ %s -debug-info-kind=line-tables-only -emit-llvm -o - \ +// RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank + +// RUN: %clang_cc1 -triple x86_64-linux-gnu -gkey-instructions -gno-column-info -x c %s -debug-info-kind=line-tables-only -emit-llvm -o - \ +// RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank + +// Check atomGroup is reset to start at 1 in each function. + +int g; +// CHECK: store{{.*}}, !dbg [[AG:!.*]] +void a() { g = 0; } + +// CHECK: store{{.*}}, !dbg [[BG:!.*]] +void b() { g = 0; } + +// CHECK: [[A:!.*]] = distinct !DISubprogram(name: "a", +// CHECK: [[AG]] = !DILocation(line: 11, scope: [[A]], atomGroup: 1, atomRank: 1) +// CHECK: [[B:!.*]] = distinct !DISubprogram(name: "b", +// CHECK: [[BG]] = !DILocation(line: 14, scope: [[B]], atomGroup: 1, atomRank: 1) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
