diff options
| author | Djordje Todorovic <djordje.todorovic@rt-rk.com> | 2019-06-27 06:07:41 +0000 |
|---|---|---|
| committer | Djordje Todorovic <djordje.todorovic@rt-rk.com> | 2019-06-27 06:07:41 +0000 |
| commit | 59b39faa1839dda3f445c077ba05be2de447ee60 (patch) | |
| tree | 0141bc3d4d51b8a120205a1bf4c87581d12ddf87 | |
| parent | 9153501f074b3599492793285088adae157235bf (diff) | |
| download | bcm5719-llvm-59b39faa1839dda3f445c077ba05be2de447ee60.tar.gz bcm5719-llvm-59b39faa1839dda3f445c077ba05be2de447ee60.zip | |
[IR] Add DISuprogram and DIE for a func decl
A unique DISubprogram may be attached to a function declaration used for
call site debug info.
([6/13] Introduce the debug entry values.)
Co-authored-by: Ananth Sowda <asowda@cisco.com>
Co-authored-by: Nikola Prica <nikola.prica@rt-rk.com>
Co-authored-by: Ivan Baev <ibaev@cisco.com>
Differential Revision: https://reviews.llvm.org/D60713
llvm-svn: 364500
| -rw-r--r-- | llvm/docs/LangRef.rst | 10 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 5 | ||||
| -rw-r--r-- | llvm/lib/IR/Verifier.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/Verifier/metadata-function-dbg.ll | 9 |
4 files changed, 23 insertions, 8 deletions
diff --git a/llvm/docs/LangRef.rst b/llvm/docs/LangRef.rst index 358a55e4654..7b74971c817 100644 --- a/llvm/docs/LangRef.rst +++ b/llvm/docs/LangRef.rst @@ -4597,10 +4597,12 @@ DISubprogram """""""""""" ``DISubprogram`` nodes represent functions from the source language. A -``DISubprogram`` may be attached to a function definition using ``!dbg`` -metadata. The ``variables:`` field points at :ref:`variables <DILocalVariable>` -that must be retained, even if their IR counterparts are optimized out of -the IR. The ``type:`` field must point at an :ref:`DISubroutineType`. +distinct ``DISubprogram`` may be attached to a function definition using +``!dbg`` metadata. A unique ``DISubprogram`` may be attached to a function +declaration used for call site debug info. The ``variables:`` field points at +:ref:`variables <DILocalVariable>` that must be retained, even if their IR +counterparts are optimized out of the IR. The ``type:`` field must point at an +:ref:`DISubroutineType`. .. _DISubprogramDeclaration: diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 24802dc2c9a..8e842f08bc0 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -706,6 +706,11 @@ DwarfDebug::getOrCreateDwarfCompileUnit(const DICompileUnit *DIUnit) { NewCU.setSection(Asm->getObjFileLowering().getDwarfInfoSection()); } + // Create DIEs for function declarations used for call site debug info. + for (auto Scope : DIUnit->getRetainedTypes()) + if (auto *SP = dyn_cast_or_null<DISubprogram>(Scope)) + NewCU.getOrCreateSubprogramDIE(SP); + CUMap.insert({DIUnit, &NewCU}); CUDieMap.insert({&NewCU.getUnitDie(), &NewCU}); return NewCU; diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp index c3bc733bac1..8fc6cb70243 100644 --- a/llvm/lib/IR/Verifier.cpp +++ b/llvm/lib/IR/Verifier.cpp @@ -2263,8 +2263,11 @@ void Verifier::visitFunction(const Function &F) { MDs.empty() ? nullptr : MDs.front().second); } else if (F.isDeclaration()) { for (const auto &I : MDs) { - AssertDI(I.first != LLVMContext::MD_dbg, - "function declaration may not have a !dbg attachment", &F); + // This is used for call site debug information. + AssertDI(I.first != LLVMContext::MD_dbg || + !cast<DISubprogram>(I.second)->isDistinct(), + "function declaration may only have a unique !dbg attachment", + &F); Assert(I.first != LLVMContext::MD_prof, "function declaration may not have a !prof attachment", &F); diff --git a/llvm/test/Verifier/metadata-function-dbg.ll b/llvm/test/Verifier/metadata-function-dbg.ll index efef9a447f4..c33299551ec 100644 --- a/llvm/test/Verifier/metadata-function-dbg.ll +++ b/llvm/test/Verifier/metadata-function-dbg.ll @@ -1,8 +1,11 @@ ; RUN: llvm-as %s -disable-output 2>&1 | FileCheck %s -; CHECK: function declaration may not have a !dbg attachment +; CHECK: function declaration may only have a unique !dbg attachment declare !dbg !4 void @f1() +; CHECK-NOT: function declaration may only have a unique !dbg attachment +declare !dbg !6 void @f5() + ; CHECK: function must have a single !dbg attachment define void @f2() !dbg !4 !dbg !4 { unreachable @@ -31,7 +34,9 @@ define void @bar() !dbg !3 { !0 = !{i32 2, !"Debug Info Version", i32 3} !llvm.dbg.cu = !{!1} -!1 = distinct !DICompileUnit(language: DW_LANG_C99, file: !2) +!1 = distinct !DICompileUnit(language: DW_LANG_C99, file: !2, retainedTypes: !5) !2 = !DIFile(filename: "t.c", directory: "/path/to/dir") !3 = !{} !4 = distinct !DISubprogram(name: "foo", scope: !1, file: !2, unit: !1) +!5 = !{!6} +!6 = !DISubprogram(name: "f5", scope: !1, file: !2, unit: !1, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized) |

