[llvm] r295173 - Fix incorrect formatting of DataRefImpl members in operator<< function

[David Bozier via llvm-commits]

Author: davidb
Date: Wed Feb 15 06:58:41 2017
New Revision: 295173

URL: http://llvm.org/viewvc/llvm-project?rev=295173&view=rev
Log:
Fix incorrect formatting of DataRefImpl members in operator<< function

Changed format specifiers to use format macro constant for pointer type. 
Moved width part of format specifier in the correct place for formatting members a and b.

Added a unit test to confirm the output.

Differential Revision: https://reviews.llvm.org/D28957


Added:
    llvm/trunk/unittests/Object/SymbolicFileTest.cpp
Modified:
    llvm/trunk/include/llvm/Object/SymbolicFile.h
    llvm/trunk/unittests/Object/CMakeLists.txt

Modified: llvm/trunk/include/llvm/Object/SymbolicFile.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/SymbolicFile.h?rev=295173&r1=295172&r2=295173&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/SymbolicFile.h (original)
+++ llvm/trunk/include/llvm/Object/SymbolicFile.h Wed Feb 15 06:58:41 2017
@@ -16,6 +16,7 @@
 
 #include "llvm/Object/Binary.h"
 #include "llvm/Support/Format.h"
+#include <cinttypes>
 #include <utility>
 
 namespace llvm {
@@ -33,7 +34,8 @@ union DataRefImpl {
 
 template <typename OStream>
 OStream& operator<<(OStream &OS, const DataRefImpl &D) {
-  OS << "(" << format("0x%x8", D.p) << " (" << format("0x%x8", D.d.a) << ", " << format("0x%x8", D.d.b) << "))";
+  OS << "(" << format("0x%08" PRIxPTR, D.p) << " (" << format("0x%08x", D.d.a)
+     << ", " << format("0x%08x", D.d.b) << "))";
   return OS;
 }
 

Modified: llvm/trunk/unittests/Object/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/CMakeLists.txt?rev=295173&r1=295172&r2=295173&view=diff
==============================================================================
--- llvm/trunk/unittests/Object/CMakeLists.txt (original)
+++ llvm/trunk/unittests/Object/CMakeLists.txt Wed Feb 15 06:58:41 2017
@@ -4,5 +4,6 @@ set(LLVM_LINK_COMPONENTS
 
 add_llvm_unittest(ObjectTests
   SymbolSizeTest.cpp
+  SymbolicFileTest.cpp
   )
 

Added: llvm/trunk/unittests/Object/SymbolicFileTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/SymbolicFileTest.cpp?rev=295173&view=auto
==============================================================================
--- llvm/trunk/unittests/Object/SymbolicFileTest.cpp (added)
+++ llvm/trunk/unittests/Object/SymbolicFileTest.cpp Wed Feb 15 06:58:41 2017
@@ -0,0 +1,34 @@
+//===- SymbolicFileTest.cpp - Tests for SymbolicFile.cpp ------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Object/SymbolicFile.h"
+#include "llvm/Support/raw_ostream.h"
+#include "gtest/gtest.h"
+#include <sstream>
+
+TEST(Object, DataRefImplOstream) {
+  std::string s;
+  llvm::raw_string_ostream OS(s);
+  llvm::object::DataRefImpl Data;
+  Data.d.a = 0xeeee0000;
+  Data.d.b = 0x0000ffff;
+
+  static_assert(sizeof Data.p == sizeof(uint64_t) ||
+                    sizeof Data.p == sizeof(uint32_t),
+                "Test expected pointer type to be 32 or 64-bit.");
+
+  char const *Expected = sizeof Data.p == sizeof(uint64_t)
+                             ? "(0xffffeeee0000 (0xeeee0000, 0x0000ffff))"
+                             : "(0xeeee0000 (0xeeee0000, 0x0000ffff))";
+
+  OS << Data;
+  OS.flush();
+
+  EXPECT_EQ(Expected, s);
+}