Skip to content

Commit a9fc9e8

Browse files
committed
[llvm-debuginfo-analyzer] Add support for parsing DWARF / CodeView source language
1 parent 6953325 commit a9fc9e8

30 files changed

+151
-22
lines changed

llvm/docs/CommandGuide/llvm-debuginfo-analyzer.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,13 @@ toolchain name, binary file format, etc.
134134
The following attributes describe the most common information for a
135135
logical element. They help to identify the lexical scope level; the
136136
element visibility across modules (global, local); the toolchain name
137-
that produced the binary file.
137+
and source language that produced the binary file.
138138

139139
.. code-block:: text
140140
141141
=global: Element referenced across Compile Units.
142142
=format: Object file format name.
143+
=language: Source language name.
143144
=level: Lexical scope level (File=0, Compile Unit=1).
144145
=local: Element referenced only in the Compile Unit.
145146
=producer: Toolchain identification name.
@@ -231,6 +232,7 @@ toolchain name, binary file format, etc.
231232
=filename
232233
=files
233234
=format
235+
=language
234236
=level
235237
=producer
236238
=publics

llvm/include/llvm/DebugInfo/LogicalView/Core/LVElement.h

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,42 @@ using LVElementRequest = std::vector<LVElementGetFunction>;
7070
// lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp.
7171
constexpr unsigned int DWARF_CHAR_BIT = 8u;
7272

73+
/// A source language supported by any of the debug info representations.
74+
struct LVSourceLanguage {
75+
static constexpr unsigned TagDwarf = 0x00;
76+
static constexpr unsigned TagCodeView = 0x01;
77+
78+
enum TaggedLanguage : uint32_t {
79+
Invalid = -1U,
80+
// DWARF
81+
#define HANDLE_DW_LANG(ID, NAME, LOWER_BOUND, VERSION, VENDOR) \
82+
DW_LANG_##NAME = (TagDwarf << 16) | ID,
83+
#include "llvm/BinaryFormat/Dwarf.def"
84+
// CodeView
85+
#define CV_LANGUAGE(NAME, ID) CV_LANG_##NAME = (TagCodeView << 16) | ID,
86+
#include "llvm/DebugInfo/CodeView/CodeViewLanguages.def"
87+
};
88+
89+
LVSourceLanguage() = default;
90+
LVSourceLanguage(llvm::dwarf::SourceLanguage SL)
91+
: Language(static_cast<TaggedLanguage>((TagDwarf << 16) | SL)) {}
92+
LVSourceLanguage(llvm::codeview::SourceLanguage SL)
93+
: Language(static_cast<TaggedLanguage>((TagCodeView << 16) | SL)) {}
94+
bool operator==(const LVSourceLanguage &SL) const {
95+
return get() == SL.get();
96+
}
97+
bool operator==(const LVSourceLanguage::TaggedLanguage &TL) const {
98+
return get() == TL;
99+
}
100+
101+
bool isValid() const { return Language != Invalid; }
102+
TaggedLanguage get() const { return Language; }
103+
StringRef getName() const;
104+
105+
private:
106+
TaggedLanguage Language = Invalid;
107+
};
108+
73109
class LVElement : public LVObject {
74110
enum class Property {
75111
IsLine, // A logical line.
@@ -220,6 +256,9 @@ class LVElement : public LVObject {
220256
virtual StringRef getProducer() const { return StringRef(); }
221257
virtual void setProducer(StringRef ProducerName) {}
222258

259+
virtual LVSourceLanguage getSourceLanguage() const { return {}; }
260+
virtual void setSourceLanguage(LVSourceLanguage SL) {}
261+
223262
virtual bool isCompileUnit() const { return false; }
224263
virtual bool isRoot() const { return false; }
225264

llvm/include/llvm/DebugInfo/LogicalView/Core/LVOptions.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ enum class LVAttributeKind {
106106
Generated, // --attribute=generated
107107
Global, // --attribute=global
108108
Inserted, // --attribute=inserted
109+
Language, // --attribute=language
109110
Level, // --attribute=level
110111
Linkage, // --attribute=linkage
111112
Local, // --attribute=local
@@ -337,6 +338,7 @@ class LVOptions {
337338
ATTRIBUTE_OPTION(Generated);
338339
ATTRIBUTE_OPTION(Global);
339340
ATTRIBUTE_OPTION(Inserted);
341+
ATTRIBUTE_OPTION(Language);
340342
ATTRIBUTE_OPTION(Level);
341343
ATTRIBUTE_OPTION(Linkage);
342344
ATTRIBUTE_OPTION(Location);

llvm/include/llvm/DebugInfo/LogicalView/Core/LVScope.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,9 @@ class LVScopeCompileUnit final : public LVScope {
418418
// Compilation directory name.
419419
size_t CompilationDirectoryIndex = 0;
420420

421+
// Source language.
422+
LVSourceLanguage SourceLanguage{};
423+
421424
// Used by the CodeView Reader.
422425
codeview::CPUType CompilationCPUType = codeview::CPUType::X64;
423426

@@ -548,6 +551,9 @@ class LVScopeCompileUnit final : public LVScope {
548551
ProducerIndex = getStringPool().getIndex(ProducerName);
549552
}
550553

554+
LVSourceLanguage getSourceLanguage() const override { return SourceLanguage; }
555+
void setSourceLanguage(LVSourceLanguage SL) override { SourceLanguage = SL; }
556+
551557
void setCPUType(codeview::CPUType Type) { CompilationCPUType = Type; }
552558
codeview::CPUType getCPUType() { return CompilationCPUType; }
553559

llvm/lib/DebugInfo/LogicalView/Core/LVElement.cpp

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include "llvm/DebugInfo/LogicalView/Core/LVElement.h"
14+
#include "llvm/DebugInfo/CodeView/EnumTables.h"
1415
#include "llvm/DebugInfo/LogicalView/Core/LVReader.h"
1516
#include "llvm/DebugInfo/LogicalView/Core/LVScope.h"
1617
#include "llvm/DebugInfo/LogicalView/Core/LVType.h"
@@ -19,6 +20,22 @@ using namespace llvm;
1920
using namespace llvm::codeview;
2021
using namespace llvm::logicalview;
2122

23+
StringRef LVSourceLanguage::getName() const {
24+
if (!isValid())
25+
return {};
26+
const unsigned Tag = (Language >> 16);
27+
switch (Tag) {
28+
case LVSourceLanguage::TagDwarf:
29+
return llvm::dwarf::LanguageString(Language & 0xffff);
30+
case LVSourceLanguage::TagCodeView: {
31+
static auto LangNames = llvm::codeview::getSourceLanguageNames();
32+
return LangNames[Language & 0xffff].Name;
33+
}
34+
default:
35+
llvm_unreachable("Unsupported language");
36+
}
37+
}
38+
2239
#define DEBUG_TYPE "Element"
2340

2441
LVElementDispatch LVElement::Dispatch = {

llvm/lib/DebugInfo/LogicalView/Core/LVOptions.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ void LVOptions::resolveDependencies() {
3939
setAttributeFilename();
4040
setAttributeFiles();
4141
setAttributeFormat();
42+
setAttributeLanguage();
4243
setAttributeLevel();
4344
setAttributeProducer();
4445
setAttributePublics();

llvm/lib/DebugInfo/LogicalView/Core/LVScope.cpp

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,11 +1717,19 @@ void LVScopeCompileUnit::print(raw_ostream &OS, bool Full) const {
17171717

17181718
void LVScopeCompileUnit::printExtra(raw_ostream &OS, bool Full) const {
17191719
OS << formattedKind(kind()) << " '" << getName() << "'\n";
1720-
if (options().getPrintFormatting() && options().getAttributeProducer())
1721-
printAttributes(OS, Full, "{Producer} ",
1722-
const_cast<LVScopeCompileUnit *>(this), getProducer(),
1723-
/*UseQuotes=*/true,
1724-
/*PrintRef=*/false);
1720+
if (options().getPrintFormatting()) {
1721+
if (options().getAttributeProducer())
1722+
printAttributes(OS, Full, "{Producer} ",
1723+
const_cast<LVScopeCompileUnit *>(this), getProducer(),
1724+
/*UseQuotes=*/true,
1725+
/*PrintRef=*/false);
1726+
if (auto SL = getSourceLanguage();
1727+
options().getAttributeLanguage() && SL.isValid())
1728+
printAttributes(OS, Full, "{Language} ",
1729+
const_cast<LVScopeCompileUnit *>(this), SL.getName(),
1730+
/*UseQuotes=*/true,
1731+
/*PrintRef=*/false);
1732+
}
17251733

17261734
// Reset file index, to allow its children to print the correct filename.
17271735
options().resetFilenameIndex();

llvm/lib/DebugInfo/LogicalView/Readers/LVCodeViewVisitor.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,9 @@ Error LVSymbolVisitor::visitKnownRecord(CVSymbol &Record,
949949
Scope->setName(CurrentObjectName);
950950
if (options().getAttributeProducer())
951951
Scope->setProducer(Compile2.Version);
952+
if (options().getAttributeLanguage())
953+
Scope->setSourceLanguage(LVSourceLanguage{
954+
static_cast<llvm::codeview::SourceLanguage>(Compile2.getLanguage())});
952955
getReader().isSystemEntry(Scope, CurrentObjectName);
953956

954957
// The line records in CodeView are recorded per Module ID. Update
@@ -994,6 +997,9 @@ Error LVSymbolVisitor::visitKnownRecord(CVSymbol &Record,
994997
Scope->setName(CurrentObjectName);
995998
if (options().getAttributeProducer())
996999
Scope->setProducer(Compile3.Version);
1000+
if (options().getAttributeLanguage())
1001+
Scope->setSourceLanguage(LVSourceLanguage{
1002+
static_cast<llvm::codeview::SourceLanguage>(Compile3.getLanguage())});
9971003
getReader().isSystemEntry(Scope, CurrentObjectName);
9981004

9991005
// The line records in CodeView are recorded per Module ID. Update

llvm/lib/DebugInfo/LogicalView/Readers/LVDWARFReader.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,11 @@ void LVDWARFReader::processOneAttribute(const DWARFDie &Die,
389389
if (options().getAttributeProducer())
390390
CurrentElement->setProducer(dwarf::toStringRef(FormValue));
391391
break;
392+
case dwarf::DW_AT_language:
393+
if (options().getAttributeLanguage())
394+
CurrentElement->setSourceLanguage(LVSourceLanguage{
395+
static_cast<llvm::dwarf::SourceLanguage>(GetAsUnsignedConstant())});
396+
break;
392397
case dwarf::DW_AT_upper_bound:
393398
CurrentElement->setUpperBound(GetBoundValue(FormValue));
394399
break;

llvm/test/tools/llvm-debuginfo-analyzer/COFF/02-coff-logical-lines.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
; The logical views shows the intermixed lines and assembler instructions,
1616
; allowing to compare the code generated by the different toolchains.
1717

18-
; RUN: llvm-debuginfo-analyzer --attribute=level,format,producer \
18+
; RUN: llvm-debuginfo-analyzer --attribute=language,level,format,producer \
1919
; RUN: --print=lines,instructions \
2020
; RUN: %p/Inputs/hello-world-codeview-clang.o \
2121
; RUN: %p/Inputs/hello-world-codeview-msvc.o 2>&1 | \
@@ -26,6 +26,7 @@
2626
; ONE-EMPTY:
2727
; ONE-NEXT: [001] {CompileUnit} 'hello-world.cpp'
2828
; ONE-NEXT: [002] {Producer} 'clang version 15.0.0 {{.*}}'
29+
; ONE-NEXT: [002] {Language} 'Cpp'
2930
; ONE-NEXT: [002] {Function} extern not_inlined 'main' -> 'int'
3031
; ONE-NEXT: [003] 4 {Line}
3132
; ONE-NEXT: [003] {Code} 'subq $0x28, %rsp'
@@ -43,6 +44,7 @@
4344
; ONE-EMPTY:
4445
; ONE-NEXT: [001] {CompileUnit} 'hello-world.cpp'
4546
; ONE-NEXT: [002] {Producer} 'Microsoft (R) Optimizing Compiler'
47+
; ONE-NEXT: [002] {Language} 'Cpp'
4648
; ONE-NEXT: [002] {Function} extern not_inlined 'main' -> 'int'
4749
; ONE-NEXT: [003] 4 {Line}
4850
; ONE-NEXT: [003] {Code} 'subq $0x28, %rsp'

0 commit comments

Comments
 (0)