Skip to content

Commit e75238a

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

File tree

8 files changed

+76
-3
lines changed

8 files changed

+76
-3
lines changed

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@
1414
#ifndef LLVM_DEBUGINFO_LOGICALVIEW_CORE_LVELEMENT_H
1515
#define LLVM_DEBUGINFO_LOGICALVIEW_CORE_LVELEMENT_H
1616

17+
#include "llvm/BinaryFormat/Dwarf.h"
18+
#include "llvm/DebugInfo/CodeView/CodeView.h"
1719
#include "llvm/DebugInfo/LogicalView/Core/LVObject.h"
1820
#include "llvm/Support/Casting.h"
1921
#include <map>
2022
#include <set>
23+
#include <variant>
2124
#include <vector>
2225

2326
namespace llvm {
@@ -64,6 +67,22 @@ using LVElementKindSet = std::set<LVElementKind>;
6467
using LVElementDispatch = std::map<LVElementKind, LVElementGetFunction>;
6568
using LVElementRequest = std::vector<LVElementGetFunction>;
6669

70+
/// A source language supported by any of the debug info representations.
71+
struct LVSourceLanguage {
72+
LVSourceLanguage() = default;
73+
LVSourceLanguage(llvm::dwarf::SourceLanguage SL) : Language(SL) {}
74+
LVSourceLanguage(llvm::codeview::SourceLanguage SL) : Language(SL) {}
75+
76+
bool isValid() const { return Language.index() != 0; }
77+
template <typename T> T getAs() { return std::get<T>(Language); }
78+
StringRef getName() const;
79+
80+
private:
81+
std::variant<std::monostate, llvm::dwarf::SourceLanguage,
82+
llvm::codeview::SourceLanguage>
83+
Language;
84+
};
85+
6786
class LVElement : public LVObject {
6887
enum class Property {
6988
IsLine, // A logical line.
@@ -214,6 +233,9 @@ class LVElement : public LVObject {
214233
virtual StringRef getProducer() const { return StringRef(); }
215234
virtual void setProducer(StringRef ProducerName) {}
216235

236+
virtual LVSourceLanguage getSourceLanguage() const { return {}; }
237+
virtual void setSourceLanguage(LVSourceLanguage SL) {}
238+
217239
virtual bool isCompileUnit() const { return false; }
218240
virtual bool isRoot() const { return false; }
219241

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,9 @@ class LVScopeCompileUnit final : public LVScope {
407407
// Toolchain producer.
408408
size_t ProducerIndex = 0;
409409

410+
// Source language.
411+
LVSourceLanguage SourceLanguage{};
412+
410413
// Compilation directory name.
411414
size_t CompilationDirectoryIndex = 0;
412415

@@ -540,6 +543,9 @@ class LVScopeCompileUnit final : public LVScope {
540543
ProducerIndex = getStringPool().getIndex(ProducerName);
541544
}
542545

546+
LVSourceLanguage getSourceLanguage() const override { return SourceLanguage; }
547+
void setSourceLanguage(LVSourceLanguage SL) override { SourceLanguage = SL; }
548+
543549
void setCPUType(codeview::CPUType Type) { CompilationCPUType = Type; }
544550
codeview::CPUType getCPUType() { return CompilationCPUType; }
545551

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

Lines changed: 18 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,23 @@ 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+
switch (Language.index()) {
27+
case 1: // DWARF
28+
return llvm::dwarf::LanguageString(
29+
std::get<llvm::dwarf::SourceLanguage>(Language));
30+
case 2: // CodeView
31+
{
32+
static auto LangNames = llvm::codeview::getSourceLanguageNames();
33+
return LangNames[std::get<llvm::codeview::SourceLanguage>(Language)].Name;
34+
}
35+
default:
36+
llvm_unreachable("Unsupported language");
37+
}
38+
}
39+
2240
#define DEBUG_TYPE "Element"
2341

2442
LVElementDispatch LVElement::Dispatch = {

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1707,11 +1707,17 @@ void LVScopeCompileUnit::print(raw_ostream &OS, bool Full) const {
17071707

17081708
void LVScopeCompileUnit::printExtra(raw_ostream &OS, bool Full) const {
17091709
OS << formattedKind(kind()) << " '" << getName() << "'\n";
1710-
if (options().getPrintFormatting() && options().getAttributeProducer())
1710+
if (options().getPrintFormatting() && options().getAttributeProducer()) {
17111711
printAttributes(OS, Full, "{Producer} ",
17121712
const_cast<LVScopeCompileUnit *>(this), getProducer(),
17131713
/*UseQuotes=*/true,
17141714
/*PrintRef=*/false);
1715+
if (auto SL = getSourceLanguage(); SL.isValid())
1716+
printAttributes(OS, Full, "{Language} ",
1717+
const_cast<LVScopeCompileUnit *>(this), SL.getName(),
1718+
/*UseQuotes=*/true,
1719+
/*PrintRef=*/false);
1720+
}
17151721

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

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -947,8 +947,11 @@ Error LVSymbolVisitor::visitKnownRecord(CVSymbol &Record,
947947
// The name of the CU, was extracted from the 'BuildInfo' subsection.
948948
Reader->setCompileUnitCPUType(Compile2.Machine);
949949
Scope->setName(CurrentObjectName);
950-
if (options().getAttributeProducer())
950+
if (options().getAttributeProducer()) {
951951
Scope->setProducer(Compile2.Version);
952+
Scope->setSourceLanguage(LVSourceLanguage{
953+
static_cast<llvm::codeview::SourceLanguage>(Compile2.getLanguage())});
954+
}
952955
getReader().isSystemEntry(Scope, CurrentObjectName);
953956

954957
// The line records in CodeView are recorded per Module ID. Update
@@ -992,8 +995,11 @@ Error LVSymbolVisitor::visitKnownRecord(CVSymbol &Record,
992995
// The name of the CU, was extracted from the 'BuildInfo' subsection.
993996
Reader->setCompileUnitCPUType(Compile3.Machine);
994997
Scope->setName(CurrentObjectName);
995-
if (options().getAttributeProducer())
998+
if (options().getAttributeProducer()) {
996999
Scope->setProducer(Compile3.Version);
1000+
Scope->setSourceLanguage(LVSourceLanguage{
1001+
static_cast<llvm::codeview::SourceLanguage>(Compile3.getLanguage())});
1002+
}
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
@@ -383,6 +383,11 @@ void LVDWARFReader::processOneAttribute(const DWARFDie &Die,
383383
if (options().getAttributeProducer())
384384
CurrentElement->setProducer(dwarf::toStringRef(FormValue));
385385
break;
386+
case dwarf::DW_AT_language:
387+
if (options().getAttributeProducer())
388+
CurrentElement->setSourceLanguage(LVSourceLanguage{
389+
static_cast<llvm::dwarf::SourceLanguage>(GetAsUnsignedConstant())});
390+
break;
386391
case dwarf::DW_AT_upper_bound:
387392
CurrentElement->setUpperBound(GetBoundValue(FormValue));
388393
break;

llvm/unittests/DebugInfo/LogicalView/CodeViewReaderTest.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ void checkElementPropertiesClangCodeview(LVReader *Reader) {
7878
EXPECT_EQ(CompileUnit->getBaseAddress(), 0u);
7979
EXPECT_TRUE(CompileUnit->getProducer().starts_with("clang"));
8080
EXPECT_EQ(CompileUnit->getName(), "test.cpp");
81+
LVSourceLanguage Language = CompileUnit->getSourceLanguage();
82+
EXPECT_TRUE(Language.isValid());
83+
ASSERT_EQ(Language.getAs<llvm::codeview::SourceLanguage>(),
84+
llvm::codeview::SourceLanguage::Cpp);
85+
ASSERT_EQ(Language.getName(), "Cpp");
8186

8287
EXPECT_EQ(Function->lineCount(), 16u);
8388
EXPECT_EQ(Function->scopeCount(), 1u);

llvm/unittests/DebugInfo/LogicalView/DWARFReaderTest.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ void checkElementProperties(LVReader *Reader) {
7272
EXPECT_EQ(CompileUnit->getBaseAddress(), 0u);
7373
EXPECT_TRUE(CompileUnit->getProducer().starts_with("clang"));
7474
EXPECT_EQ(CompileUnit->getName(), "test.cpp");
75+
LVSourceLanguage Language = CompileUnit->getSourceLanguage();
76+
EXPECT_TRUE(Language.isValid());
77+
EXPECT_EQ(Language.getAs<llvm::dwarf::SourceLanguage>(),
78+
llvm::dwarf::DW_LANG_C_plus_plus_14);
79+
EXPECT_EQ(Language.getName(), "DW_LANG_C_plus_plus_14");
7580

7681
EXPECT_EQ(CompileUnit->lineCount(), 0u);
7782
EXPECT_EQ(CompileUnit->scopeCount(), 1u);

0 commit comments

Comments
 (0)