Make some fixes for LiveInterval repair with debug info. Debug value

[oota-llvm.git] / lib / DebugInfo / DWARFDebugArangeSet.cpp

diff --git a/lib/DebugInfo/DWARFDebugArangeSet.cpp b/lib/DebugInfo/DWARFDebugArangeSet.cpp
index 148b770bd84752105c05cc81493a6cc4a539d41f..2efbfd1f92fb946ae5c2a9c96c0f40ff53683e26 100644 (file)
--- a/lib/DebugInfo/DWARFDebugArangeSet.cpp
+++ b/lib/DebugInfo/DWARFDebugArangeSet.cpp
@@ -122,19 +122,22 @@ void DWARFDebugArangeSet::dump(raw_ostream &OS) const {
   const uint32_t hex_width = Header.AddrSize * 2;
   for (DescriptorConstIter pos = ArangeDescriptors.begin(),
        end = ArangeDescriptors.end(); pos != end; ++pos)
-    OS << format("[0x%*.*llx -", hex_width, hex_width, pos->Address)
-       << format(" 0x%*.*llx)\n", hex_width, hex_width, pos->getEndAddress());
+    OS << format("[0x%*.*" PRIx64 " -", hex_width, hex_width, pos->Address)
+       << format(" 0x%*.*" PRIx64 ")\n",
+                 hex_width, hex_width, pos->getEndAddress());
 }
 
 
-class DescriptorContainsAddress {
-  const uint64_t Address;
-public:
-  DescriptorContainsAddress(uint64_t address) : Address(address) {}
-  bool operator()(const DWARFDebugArangeSet::Descriptor &desc) const {
-    return Address >= desc.Address && Address < (desc.Address + desc.Length);
-  }
-};
+namespace {
+  class DescriptorContainsAddress {
+    const uint64_t Address;
+  public:
+    DescriptorContainsAddress(uint64_t address) : Address(address) {}
+    bool operator()(const DWARFDebugArangeSet::Descriptor &desc) const {
+      return Address >= desc.Address && Address < (desc.Address + desc.Length);
+    }
+  };
+}
 
 uint32_t DWARFDebugArangeSet::findAddress(uint64_t address) const {
   DescriptorConstIter end = ArangeDescriptors.end();