[llvm] bb64064 - [DebugInfo] Simplify DwarfDebug::emitMacro
David Stenberg via llvm-commits
llvm-commits at lists.llvm.org
Tue Aug 11 08:00:52 PDT 2020
Author: David Stenberg
Date: 2020-08-11T17:00:25+02:00
New Revision: bb640645f52410cac9c82eb8295cb4d442efd29e
URL: https://github.com/llvm/llvm-project/commit/bb640645f52410cac9c82eb8295cb4d442efd29e
DIFF: https://github.com/llvm/llvm-project/commit/bb640645f52410cac9c82eb8295cb4d442efd29e.diff
LOG: [DebugInfo] Simplify DwarfDebug::emitMacro
Broken out from a review comment on D82975. This is an NFC expect for
that the Macinfo macro string is now emitted using a single emitBytes()
invocation, so it can be done using a single string directive.
Reviewed By: dblaikie
Differential Revision: https://reviews.llvm.org/D83557
Added:
Modified:
llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
Removed:
################################################################################
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 34974326b2fb..3fb47948b4dc 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -3019,6 +3019,10 @@ void DwarfDebug::emitMacro(DIMacro &M) {
StringRef Name = M.getName();
StringRef Value = M.getValue();
+ // There should be one space between the macro name and the macro value in
+ // define entries. In undef entries, only the macro name is emitted.
+ std::string Str = Value.empty() ? Name.str() : (Name + " " + Value).str();
+
if (UseDebugMacroSection) {
unsigned Type = M.getMacinfoType() == dwarf::DW_MACINFO_define
? dwarf::DW_MACRO_define_strx
@@ -3028,29 +3032,15 @@ void DwarfDebug::emitMacro(DIMacro &M) {
Asm->OutStreamer->AddComment("Line Number");
Asm->emitULEB128(M.getLine());
Asm->OutStreamer->AddComment("Macro String");
- if (!Value.empty())
- Asm->emitULEB128(this->InfoHolder.getStringPool()
- .getIndexedEntry(*Asm, (Name + " " + Value).str())
- .getIndex());
- else
- // DW_MACRO_undef_strx doesn't have a value, so just emit the macro
- // string.
- Asm->emitULEB128(this->InfoHolder.getStringPool()
- .getIndexedEntry(*Asm, (Name).str())
- .getIndex());
+ Asm->emitULEB128(
+ InfoHolder.getStringPool().getIndexedEntry(*Asm, Str).getIndex());
} else {
Asm->OutStreamer->AddComment(dwarf::MacinfoString(M.getMacinfoType()));
Asm->emitULEB128(M.getMacinfoType());
Asm->OutStreamer->AddComment("Line Number");
Asm->emitULEB128(M.getLine());
Asm->OutStreamer->AddComment("Macro String");
- Asm->OutStreamer->emitBytes(Name);
- if (!Value.empty()) {
- // There should be one space between macro name and macro value.
- Asm->emitInt8(' ');
- Asm->OutStreamer->AddComment("Macro Value=");
- Asm->OutStreamer->emitBytes(Value);
- }
+ Asm->OutStreamer->emitBytes(Str);
Asm->emitInt8('\0');
}
}
More information about the llvm-commits
mailing list