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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@295173 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Object/SymbolicFile.h b/include/llvm/Object/SymbolicFile.h
index af62e62c51d8f780655413a5234d5e3ee84118f0..ef0f96f7834abd11085196ef0e3a19ccdee9120c 100644 (file)
--- a/include/llvm/Object/SymbolicFile.h
+++ b/include/llvm/Object/SymbolicFile.h
@@ -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;
 }
 

diff --git a/unittests/Object/CMakeLists.txt b/unittests/Object/CMakeLists.txt
index 7a63c167a30b9aabb1b0700272d8f13b5fb5b654..e1376bffbc0f59a760a5cc568daf22c50f70c8c2 100644 (file)
--- a/unittests/Object/CMakeLists.txt
+++ b/unittests/Object/CMakeLists.txt
@@ -4,5 +4,6 @@ set(LLVM_LINK_COMPONENTS
 
 add_llvm_unittest(ObjectTests
   SymbolSizeTest.cpp
+  SymbolicFileTest.cpp
   )
 

diff --git a/unittests/Object/SymbolicFileTest.cpp b/unittests/Object/SymbolicFileTest.cpp
new file mode 100644 (file)
index 0000000..6185910
--- /dev/null
+++ b/unittests/Object/SymbolicFileTest.cpp
@@ -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);
+}