[llvm-branch-commits] [llvm-branch] r310398 - Merging r310253 and r310267:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Aug  8 11:43:25 2017
New Revision: 310398

URL: http://llvm.org/viewvc/llvm-project?rev=310398&view=rev
Log:
Merging r310253 and r310267:
------------------------------------------------------------------------
r310253 | sdardis | 2017-08-07 06:30:03 -0700 (Mon, 07 Aug 2017) | 2 lines

[DebugInfo][DWARF] Use PRIx64 explicitly in output.

------------------------------------------------------------------------

------------------------------------------------------------------------
r310267 | sdardis | 2017-08-07 09:08:11 -0700 (Mon, 07 Aug 2017) | 2 lines

[DebugInfo][DWARF] Address paulr's comment on rL310253.

------------------------------------------------------------------------

Modified:
    llvm/branches/release_50/   (props changed)
    llvm/branches/release_50/lib/DebugInfo/DWARF/DWARFContext.cpp

Propchange: llvm/branches/release_50/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  8 11:43:25 2017
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,308483-308484,308503,308808,308813,308891,308906,308950,308963,308978,308986,309113,309302,309321,309323,309325,309330,309343,309353,309355,309422,309481,309483,309495,309555,309561,309594,309651,309744,309849,309928,309930,310071,310190,310240-310242,310250
+/llvm/trunk:155241,308483-308484,308503,308808,308813,308891,308906,308950,308963,308978,308986,309113,309302,309321,309323,309325,309330,309343,309353,309355,309422,309481,309483,309495,309555,309561,309594,309651,309744,309849,309928,309930,310071,310190,310240-310242,310250,310253,310267

Modified: llvm/branches/release_50/lib/DebugInfo/DWARF/DWARFContext.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_50/lib/DebugInfo/DWARF/DWARFContext.cpp?rev=310398&r1=310397&r2=310398&view=diff
==============================================================================
--- llvm/branches/release_50/lib/DebugInfo/DWARF/DWARFContext.cpp (original)
+++ llvm/branches/release_50/lib/DebugInfo/DWARF/DWARFContext.cpp Tue Aug  8 11:43:25 2017
@@ -134,13 +134,13 @@ dumpDWARFv5StringOffsetsSection(raw_ostr
       uint64_t StringOffset =
           StrOffsetExt.getRelocatedValue(EntrySize, &Offset);
       if (Format == DWARF32) {
-        OS << format("%8.8x ", StringOffset);
         uint32_t StringOffset32 = (uint32_t)StringOffset;
+        OS << format("%8.8x ", StringOffset32);
         const char *S = StrData.getCStr(&StringOffset32);
         if (S)
           OS << format("\"%s\"", S);
       } else
-        OS << format("%16.16x ", StringOffset);
+        OS << format("%16.16" PRIx64 " ", StringOffset);
       OS << "\n";
     }
   }