From 6e73f12a641bb8fd965d28937ea3a6d1dcecc8c0 Mon Sep 17 00:00:00 2001
From: Greg Clayton <gclayton@fb.com>
Date: Wed, 13 May 2020 22:01:57 -0700
Subject: [PATCH] Fix buildbots errors after comitting D78782.

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

https://reviews.llvm.org/D78782
---
 llvm/include/llvm/ObjectYAML/DWARFYAML.h |  2 +-
 llvm/lib/ObjectYAML/DWARFEmitter.cpp     | 16 ++++++++--------
 llvm/lib/ObjectYAML/DWARFYAML.cpp        | 12 ++++++------
 llvm/tools/obj2yaml/dwarf2yaml.cpp       |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/llvm/include/llvm/ObjectYAML/DWARFYAML.h b/llvm/include/llvm/ObjectYAML/DWARFYAML.h
index 3c87a5f0c499e..8049d4911b86e 100644
--- a/llvm/include/llvm/ObjectYAML/DWARFYAML.h
+++ b/llvm/include/llvm/ObjectYAML/DWARFYAML.h
@@ -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;
 
diff --git a/llvm/lib/ObjectYAML/DWARFEmitter.cpp b/llvm/lib/ObjectYAML/DWARFEmitter.cpp
index 645558d9ddd0f..a04f3c8f08d03 100644
--- a/llvm/lib/ObjectYAML/DWARFEmitter.cpp
+++ b/llvm/lib/ObjectYAML/DWARFEmitter.cpp
@@ -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);
   }
 }
 
diff --git a/llvm/lib/ObjectYAML/DWARFYAML.cpp b/llvm/lib/ObjectYAML/DWARFYAML.cpp
index 82033b4f90c69..cff8c2b3359b6 100644
--- a/llvm/lib/ObjectYAML/DWARFYAML.cpp
+++ b/llvm/lib/ObjectYAML/DWARFYAML.cpp
@@ -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,
diff --git a/llvm/tools/obj2yaml/dwarf2yaml.cpp b/llvm/tools/obj2yaml/dwarf2yaml.cpp
index df876853fd31e..a007efe7e507f 100644
--- a/llvm/tools/obj2yaml/dwarf2yaml.cpp
+++ b/llvm/tools/obj2yaml/dwarf2yaml.cpp
@@ -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();
 }