replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

llvm-svn: 295173
This commit is contained in:
David Bozier 2017-02-15 12:58:41 +00:00
parent 9a618e1d17
commit 4ab9a06f6a
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/Object/SymbolicFile.h
View File

@ -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;
}

1
llvm/unittests/Object/CMakeLists.txt
View File

@ -4,5 +4,6 @@ set(LLVM_LINK_COMPONENTS
add_llvm_unittest(ObjectTests
SymbolSizeTest.cpp
SymbolicFileTest.cpp
)

34
llvm/unittests/Object/SymbolicFileTest.cpp Normal file
View File

@ -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);
}