From 5ca98fd98791947eba83a1ed3f2c8191ef7afa6c Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 24 Nov 2014 09:08:18 +0000 Subject: Vendor import of llvm RELEASE_350/final tag r216957 (effectively, 3.5.0 release): https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_350/final@216957 --- lib/DebugInfo/DWARFDebugArangeSet.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lib/DebugInfo/DWARFDebugArangeSet.cpp') diff --git a/lib/DebugInfo/DWARFDebugArangeSet.cpp b/lib/DebugInfo/DWARFDebugArangeSet.cpp index 229376e4a1c72..c0a33ceaf2432 100644 --- a/lib/DebugInfo/DWARFDebugArangeSet.cpp +++ b/lib/DebugInfo/DWARFDebugArangeSet.cpp @@ -67,7 +67,9 @@ DWARFDebugArangeSet::extract(DataExtractor data, uint32_t *offset_ptr) { Descriptor arangeDescriptor; - assert(sizeof(arangeDescriptor.Address) == sizeof(arangeDescriptor.Length)); + static_assert(sizeof(arangeDescriptor.Address) == + sizeof(arangeDescriptor.Length), + "Different datatypes for addresses and sizes!"); assert(sizeof(arangeDescriptor.Address) >= HeaderData.AddrSize); while (data.isValidOffset(*offset_ptr)) { @@ -94,9 +96,9 @@ void DWARFDebugArangeSet::dump(raw_ostream &OS) const { HeaderData.CuOffset, HeaderData.AddrSize, HeaderData.SegSize); const uint32_t hex_width = HeaderData.AddrSize * 2; - for (DescriptorConstIter pos = ArangeDescriptors.begin(), - end = ArangeDescriptors.end(); pos != end; ++pos) - OS << format("[0x%*.*" PRIx64 " -", hex_width, hex_width, pos->Address) + for (const auto &Desc : ArangeDescriptors) { + OS << format("[0x%*.*" PRIx64 " -", hex_width, hex_width, Desc.Address) << format(" 0x%*.*" PRIx64 ")\n", - hex_width, hex_width, pos->getEndAddress()); + hex_width, hex_width, Desc.getEndAddress()); + } } -- cgit v1.3