[llvm] 71e5488 - DebugInfo: Migrate callers from getAsCString to dwarf::toString
David Blaikie via llvm-commits
llvm-commits at lists.llvm.org
Tue Dec 14 14:50:53 PST 2021
Author: David Blaikie
Date: 2021-12-14T14:50:43-08:00
New Revision: 71e5488a195dde08a76e923814e036c68033869f
URL: https://github.com/llvm/llvm-project/commit/71e5488a195dde08a76e923814e036c68033869f
DIFF: https://github.com/llvm/llvm-project/commit/71e5488a195dde08a76e923814e036c68033869f.diff
LOG: DebugInfo: Migrate callers from getAsCString to dwarf::toString
This makes a bunch of these call sites independent of a follow-up change
I'm making to have getAsCString return Expected<const char*> for more
descriptive error messages so that the failures there can be
communicated up to DWARFVerifier (or other callers who want to provide
more verbose diagnostics) so DWARFVerifier doesn't have to re-implement
the string lookup logic and error checking.
Added:
Modified:
llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
llvm/lib/DWARFLinker/DWARFLinker.cpp
llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
llvm/lib/DebugInfo/DWARF/DWARFExpression.cpp
llvm/tools/obj2yaml/dwarf2yaml.cpp
llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp
llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
index 3c051c3ea0186..858b6d432bbf5 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
@@ -199,7 +199,9 @@ inline StringRef toStringRef(const Optional<DWARFFormValue> &V,
/// form value's encoding wasn't a string.
inline const char *toString(const Optional<DWARFFormValue> &V,
const char *Default) {
- return toString(V).getValueOr(Default);
+ if (auto E = toString(V))
+ return *E;
+ return Default;
}
/// Take an optional DWARFFormValue and try to extract an unsigned constant.
diff --git a/llvm/lib/DWARFLinker/DWARFLinker.cpp b/llvm/lib/DWARFLinker/DWARFLinker.cpp
index ad351eb9d7ce8..ae0859e1ecfdf 100644
--- a/llvm/lib/DWARFLinker/DWARFLinker.cpp
+++ b/llvm/lib/DWARFLinker/DWARFLinker.cpp
@@ -223,22 +223,21 @@ static void analyzeImportedModule(
SysRoot = CU.getSysRoot();
if (!SysRoot.empty() && Path.startswith(SysRoot))
return;
- if (Optional<DWARFFormValue> Val = DIE.find(dwarf::DW_AT_name))
- if (Optional<const char *> Name = Val->getAsCString()) {
- auto &Entry = (*ParseableSwiftInterfaces)[*Name];
- // The prepend path is applied later when copying.
- DWARFDie CUDie = CU.getOrigUnit().getUnitDIE();
- SmallString<128> ResolvedPath;
- if (sys::path::is_relative(Path))
- resolveRelativeObjectPath(ResolvedPath, CUDie);
- sys::path::append(ResolvedPath, Path);
- if (!Entry.empty() && Entry != ResolvedPath)
- ReportWarning(
- Twine("Conflicting parseable interfaces for Swift Module ") +
- *Name + ": " + Entry + " and " + Path,
- DIE);
- Entry = std::string(ResolvedPath.str());
- }
+ Optional<const char*> Name = dwarf::toString(DIE.find(dwarf::DW_AT_name));
+ if (!Name)
+ return;
+ auto &Entry = (*ParseableSwiftInterfaces)[*Name];
+ // The prepend path is applied later when copying.
+ DWARFDie CUDie = CU.getOrigUnit().getUnitDIE();
+ SmallString<128> ResolvedPath;
+ if (sys::path::is_relative(Path))
+ resolveRelativeObjectPath(ResolvedPath, CUDie);
+ sys::path::append(ResolvedPath, Path);
+ if (!Entry.empty() && Entry != ResolvedPath)
+ ReportWarning(Twine("Conflicting parseable interfaces for Swift Module ") +
+ *Name + ": " + Entry + " and " + Path,
+ DIE);
+ Entry = std::string(ResolvedPath.str());
}
/// The distinct types of work performed by the work loop in
@@ -846,7 +845,7 @@ void DWARFLinker::assignAbbrev(DIEAbbrev &Abbrev) {
unsigned DWARFLinker::DIECloner::cloneStringAttribute(
DIE &Die, AttributeSpec AttrSpec, const DWARFFormValue &Val,
const DWARFUnit &U, OffsetsStringPool &StringPool, AttributesInfo &Info) {
- Optional<const char *> String = Val.getAsCString();
+ Optional<const char *> String = dwarf::toString(Val);
if (!String)
return 0;
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
index c8331487f2821..95135c95e8d2e 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -1195,7 +1195,7 @@ void DWARFContext::addLocalsForDie(DWARFCompileUnit *CU, DWARFDie Subprogram,
Die.getAttributeValueAsReferencedDie(DW_AT_abstract_origin))
Die = Origin;
if (auto NameAttr = Die.find(DW_AT_name))
- if (Optional<const char *> Name = NameAttr->getAsCString())
+ if (Optional<const char *> Name = dwarf::toString(*NameAttr))
Local.Name = *Name;
if (auto Type = Die.getAttributeValueAsReferencedDie(DW_AT_type))
Local.Size = getTypeSize(Type, getCUAddrSize());
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
index bda41b1f34e9c..f36d3f87257a8 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
@@ -1331,8 +1331,8 @@ Optional<StringRef> DWARFDebugLine::LineTable::getSourceByIndex(uint64_t FileInd
if (Kind == FileLineInfoKind::None || !Prologue.hasFileAtIndex(FileIndex))
return None;
const FileNameEntry &Entry = Prologue.getFileNameEntry(FileIndex);
- if (Optional<const char *> source = Entry.Source.getAsCString())
- return StringRef(*source);
+ if (auto E = dwarf::toString(Entry.Source))
+ return StringRef(*E);
return None;
}
@@ -1350,10 +1350,10 @@ bool DWARFDebugLine::Prologue::getFileNameByIndex(
if (Kind == FileLineInfoKind::None || !hasFileAtIndex(FileIndex))
return false;
const FileNameEntry &Entry = getFileNameEntry(FileIndex);
- Optional<const char *> Name = Entry.Name.getAsCString();
- if (!Name)
+ auto E = dwarf::toString(Entry.Name);
+ if (!E)
return false;
- StringRef FileName = *Name;
+ StringRef FileName = *E;
if (Kind == FileLineInfoKind::RawValue ||
isPathAbsoluteOnWindowsOrPosix(FileName)) {
Result = std::string(FileName);
@@ -1372,11 +1372,10 @@ bool DWARFDebugLine::Prologue::getFileNameByIndex(
// relative names.
if ((Entry.DirIdx != 0 || Kind != FileLineInfoKind::RelativeFilePath) &&
Entry.DirIdx < IncludeDirectories.size())
- IncludeDir = IncludeDirectories[Entry.DirIdx].getAsCString().getValue();
+ IncludeDir = dwarf::toStringRef(IncludeDirectories[Entry.DirIdx]);
} else {
if (0 < Entry.DirIdx && Entry.DirIdx <= IncludeDirectories.size())
- IncludeDir =
- IncludeDirectories[Entry.DirIdx - 1].getAsCString().getValue();
+ IncludeDir = dwarf::toStringRef(IncludeDirectories[Entry.DirIdx - 1]);
}
// For absolute paths only, include the compilation directory of compile unit.
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFExpression.cpp b/llvm/lib/DebugInfo/DWARF/DWARFExpression.cpp
index d0fbd702e831b..e19f5b8138fa0 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFExpression.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFExpression.cpp
@@ -217,8 +217,8 @@ static void prettyPrintBaseTypeRef(DWARFUnit *U, raw_ostream &OS,
if (DumpOpts.Verbose)
OS << format("0x%08" PRIx64 " -> ", Operands[Operand]);
OS << format("0x%08" PRIx64 ")", U->getOffset() + Operands[Operand]);
- if (auto Name = Die.find(dwarf::DW_AT_name))
- OS << " \"" << Name->getAsCString() << "\"";
+ if (auto Name = dwarf::toString(Die.find(dwarf::DW_AT_name)))
+ OS << " \"" << *Name << "\"";
} else {
OS << format(" <invalid base_type ref: 0x%" PRIx64 ">",
Operands[Operand]);
diff --git a/llvm/tools/obj2yaml/dwarf2yaml.cpp b/llvm/tools/obj2yaml/dwarf2yaml.cpp
index c8459b502a60c..8c164e24d619c 100644
--- a/llvm/tools/obj2yaml/dwarf2yaml.cpp
+++ b/llvm/tools/obj2yaml/dwarf2yaml.cpp
@@ -291,8 +291,8 @@ void dumpDebugInfo(DWARFContext &DCtx, DWARFYAML::Data &Y) {
NewValue.Value = Val.getValue();
break;
case dwarf::DW_FORM_string:
- if (auto Val = FormValue.getValue().getAsCString())
- NewValue.CStr = Val.getValue();
+ if (auto Val = dwarf::toString(FormValue))
+ NewValue.CStr = *Val;
break;
case dwarf::DW_FORM_indirect:
indirect = true;
diff --git a/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp b/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
index a4e6b56456a37..68d06003a5e5c 100644
--- a/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
+++ b/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
@@ -1504,7 +1504,7 @@ TEST(DWARFDebugInfo, TestAttributeIterators) {
ASSERT_NE(E, I);
EXPECT_EQ(I->Attr, DW_AT_name);
- auto ActualCUPath = I->Value.getAsCString();
+ auto ActualCUPath = toString(I->Value);
EXPECT_EQ(CUPath, *ActualCUPath);
ASSERT_NE(E, ++I);
diff --git a/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp b/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp
index c01a20e9186c2..a8502df2b34b2 100644
--- a/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp
+++ b/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp
@@ -170,11 +170,11 @@ void checkDefaultPrologue(uint16_t Version, DwarfFormat Format,
EXPECT_EQ(Prologue.StandardOpcodeLengths, ExpectedLengths);
ASSERT_EQ(Prologue.IncludeDirectories.size(), 1u);
ASSERT_EQ(Prologue.IncludeDirectories[0].getForm(), DW_FORM_string);
- EXPECT_STREQ(*Prologue.IncludeDirectories[0].getAsCString(), "a dir");
+ EXPECT_STREQ(*toString(Prologue.IncludeDirectories[0]), "a dir");
ASSERT_EQ(Prologue.FileNames.size(), 1u);
ASSERT_EQ(Prologue.FileNames[0].Name.getForm(), DW_FORM_string);
ASSERT_EQ(Prologue.FileNames[0].DirIdx, 0u);
- EXPECT_STREQ(*Prologue.FileNames[0].Name.getAsCString(), "a file");
+ EXPECT_STREQ(*toString(Prologue.FileNames[0].Name), "a file");
}
#ifdef _AIX
diff --git a/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp b/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp
index 1f7e922aed0c3..e294239cd7857 100644
--- a/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp
+++ b/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp
@@ -336,15 +336,13 @@ static void writeCString(StringRef Str, AsmPrinter &Asm) {
static void writeV2IncludeAndFileTable(const DWARFDebugLine::Prologue &Prologue,
AsmPrinter &Asm) {
- for (auto Include : Prologue.IncludeDirectories) {
- assert(Include.getAsCString() && "expected a string form for include dir");
- writeCString(*Include.getAsCString(), Asm);
- }
+ for (auto Include : Prologue.IncludeDirectories)
+ writeCString(*toString(Include), Asm);
+
Asm.emitInt8(0);
for (auto File : Prologue.FileNames) {
- assert(File.Name.getAsCString() && "expected a string form for file name");
- writeCString(*File.Name.getAsCString(), Asm);
+ writeCString(*toString(File.Name), Asm);
Asm.emitULEB128(File.DirIdx);
Asm.emitULEB128(File.ModTime);
Asm.emitULEB128(File.Length);
@@ -360,10 +358,8 @@ static void writeV5IncludeAndFileTable(const DWARFDebugLine::Prologue &Prologue,
Asm.emitULEB128(DW_LNCT_path);
Asm.emitULEB128(DW_FORM_string);
Asm.emitULEB128(Prologue.IncludeDirectories.size());
- for (auto Include : Prologue.IncludeDirectories) {
- assert(Include.getAsCString() && "expected a string form for include dir");
- writeCString(*Include.getAsCString(), Asm);
- }
+ for (auto Include : Prologue.IncludeDirectories)
+ writeCString(*toString(Include), Asm);
Asm.emitInt8(2); // file_name_entry_format_count.
Asm.emitULEB128(DW_LNCT_path);
@@ -372,8 +368,7 @@ static void writeV5IncludeAndFileTable(const DWARFDebugLine::Prologue &Prologue,
Asm.emitULEB128(DW_FORM_data1);
Asm.emitULEB128(Prologue.FileNames.size());
for (auto File : Prologue.FileNames) {
- assert(File.Name.getAsCString() && "expected a string form for file name");
- writeCString(*File.Name.getAsCString(), Asm);
+ writeCString(*toString(File.Name), Asm);
Asm.emitInt8(File.DirIdx);
}
}
More information about the llvm-commits
mailing list