RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Fix buildbots errors after comitting D78782.

Browse Source 
Rename "Ranges" variables to "DebugRanges" to avoid warnings/errors on machines that have extra settings enabled.

https://reviews.llvm.org/D78782
This commit is contained in:
Greg Clayton 2020-05-13 22:01:57 -07:00
parent b85fb4608d
commit a6a42f2f8d
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/ObjectYAML/DWARFYAML.h
View File

@ -159,7 +159,7 @@ struct Data {
std::vector<Abbrev> AbbrevDecls;
std::vector<StringRef> DebugStrings;
std::vector<ARange> ARanges;
std::vector<Ranges> Ranges;
std::vector<Ranges> DebugRanges;
PubSection PubNames;
PubSection PubTypes;

16
lib/ObjectYAML/DWARFEmitter.cpp
View File

@ -116,18 +116,18 @@ void DWARFYAML::EmitDebugAranges(raw_ostream &OS, const DWARFYAML::Data &DI) {
void DWARFYAML::EmitDebugRanges(raw_ostream &OS, const DWARFYAML::Data &DI) {
const size_t RangesOffset = OS.tell();
for (auto Ranges : DI.Ranges) {
for (auto DebugRanges : DI.DebugRanges) {
const size_t CurrOffset = OS.tell() - RangesOffset;
assert(Ranges.Offset <= CurrOffset);
if (Ranges.Offset > CurrOffset)
ZeroFillBytes(OS, Ranges.Offset - CurrOffset);
for (auto Entry : Ranges.Entries) {
writeVariableSizedInteger(Entry.LowOffset, Ranges.AddrSize, OS,
assert(DebugRanges.Offset <= CurrOffset);
if (DebugRanges.Offset > CurrOffset)
ZeroFillBytes(OS, DebugRanges.Offset - CurrOffset);
for (auto Entry : DebugRanges.Entries) {
writeVariableSizedInteger(Entry.LowOffset, DebugRanges.AddrSize, OS,
DI.IsLittleEndian);
writeVariableSizedInteger(Entry.HighOffset, Ranges.AddrSize, OS,
writeVariableSizedInteger(Entry.HighOffset, DebugRanges.AddrSize, OS,
DI.IsLittleEndian);
}
ZeroFillBytes(OS, Ranges.AddrSize * 2);
ZeroFillBytes(OS, DebugRanges.AddrSize * 2);
}
}

12
lib/ObjectYAML/DWARFYAML.cpp
View File

@ -28,8 +28,8 @@ void MappingTraits<DWARFYAML::Data>::mapping(IO &IO, DWARFYAML::Data &DWARF) {
IO.mapOptional("debug_abbrev", DWARF.AbbrevDecls);
if (!DWARF.ARanges.empty() || !IO.outputting())
IO.mapOptional("debug_aranges", DWARF.ARanges);
if (!DWARF.Ranges.empty() || !IO.outputting())
IO.mapOptional("debug_ranges", DWARF.Ranges);
if (!DWARF.DebugRanges.empty() || !IO.outputting())
IO.mapOptional("debug_ranges", DWARF.DebugRanges);
if (!DWARF.PubNames.Entries.empty() || !IO.outputting())
IO.mapOptional("debug_pubnames", DWARF.PubNames);
if (!DWARF.PubTypes.Entries.empty() || !IO.outputting())
@ -82,10 +82,10 @@ void MappingTraits<DWARFYAML::RangeEntry>::mapping(
}
void MappingTraits<DWARFYAML::Ranges>::mapping(IO &IO,
DWARFYAML::Ranges &Ranges) {
IO.mapRequired("Offset", Ranges.Offset);
IO.mapRequired("AddrSize", Ranges.AddrSize);
IO.mapRequired("Entries", Ranges.Entries);
DWARFYAML::Ranges &DebugRanges) {
IO.mapRequired("Offset", DebugRanges.Offset);
IO.mapRequired("AddrSize", DebugRanges.AddrSize);
IO.mapRequired("Entries", DebugRanges.Entries);
}
void MappingTraits<DWARFYAML::PubEntry>::mapping(IO &IO,

2
tools/obj2yaml/dwarf2yaml.cpp
View File

@ -109,7 +109,7 @@ Error dumpDebugRanges(DWARFContext &DCtx, DWARFYAML::Data &Y) {
return E;
for (const auto &RLE : DwarfRanges.getEntries())
YamlRanges.Entries.push_back({RLE.StartAddress, RLE.EndAddress});
Y.Ranges.push_back(std::move(YamlRanges));
Y.DebugRanges.push_back(std::move(YamlRanges));
}
return ErrorSuccess();
}