diff options
author | Michael Kruse <llvm@meinersbur.de> | 2018-07-26 15:31:41 +0000 |
---|---|---|
committer | Michael Kruse <llvm@meinersbur.de> | 2018-07-26 15:31:41 +0000 |
commit | 6069e66e2cad8d50bdf328b7e6835bd81cd35de5 (patch) | |
tree | a3a8b69c30bb6d7f26ed018c70c98e9d552f32d9 /tools | |
parent | 0b19d8a7b1d23ab91612d42f3c3d1746854b0cf6 (diff) |
[ADT] Replace std::isprint by llvm::isPrint.
The standard library functions ::isprint/std::isprint have platform-
and locale-dependent behavior which makes LLVM's output less
predictable. In particular, regression tests my fail depending on the
implementation of these functions.
Implement llvm::isPrint in StringExtras.h with a standard behavior and
replace all uses of ::isprint/std::isprint by a call it llvm::isPrint.
The function is inlined and does not look up language settings so it
should perform better than the standard library's version.
Such a replacement has already been done for isdigit, isalpha, isxdigit
in r314883. gtest does the same in gtest-printers.cc using the following
justification:
// Returns true if c is a printable ASCII character. We test the
// value of c directly instead of calling isprint(), which is buggy on
// Windows Mobile.
inline bool IsPrintableAscii(wchar_t c) {
return 0x20 <= c && c <= 0x7E;
}
Similar issues have also been encountered by Julia:
https://github.com/JuliaLang/julia/issues/7416
I noticed the problem myself when on Windows isprint('\t') started to
evaluate to true (see https://stackoverflow.com/questions/51435249) and
thus caused several unit tests to fail. The result of isprint doesn't
seem to be well-defined even for ASCII characters. Therefore I suggest
to replace isprint by a platform-independent version.
Differential Revision: https://reviews.llvm.org/D49680
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@338034 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r-- | tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp | 4 | ||||
-rw-r--r-- | tools/llvm-objdump/llvm-objdump.cpp | 4 | ||||
-rw-r--r-- | tools/llvm-readobj/ObjDumper.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp b/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp index 4551718344c..1939dc6440f 100644 --- a/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp +++ b/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp @@ -699,7 +699,7 @@ static bool ParseBlock(BitstreamCursor &Stream, BitstreamBlockInfo &BlockInfo, std::string Str; bool ArrayIsPrintable = true; for (unsigned j = i - 1, je = Record.size(); j != je; ++j) { - if (!isprint(static_cast<unsigned char>(Record[j]))) { + if (!isPrint(static_cast<unsigned char>(Record[j]))) { ArrayIsPrintable = false; break; } @@ -719,7 +719,7 @@ static bool ParseBlock(BitstreamCursor &Stream, BitstreamBlockInfo &BlockInfo, } else { bool BlobIsPrintable = true; for (unsigned i = 0, e = Blob.size(); i != e; ++i) - if (!isprint(static_cast<unsigned char>(Blob[i]))) { + if (!isPrint(static_cast<unsigned char>(Blob[i]))) { BlobIsPrintable = false; break; } diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index 610cd11365c..8041e6f5994 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/tools/llvm-objdump/llvm-objdump.cpp @@ -1651,7 +1651,7 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) { } Byte = Bytes.slice(Index)[0]; outs() << format(" %02x", Byte); - AsciiData[NumBytes] = isprint(Byte) ? Byte : '.'; + AsciiData[NumBytes] = isPrint(Byte) ? Byte : '.'; uint8_t IndentOffset = 0; NumBytes++; @@ -1899,7 +1899,7 @@ void llvm::PrintSectionContents(const ObjectFile *Obj) { // Print ascii. outs() << " "; for (std::size_t i = 0; i < 16 && addr + i < end; ++i) { - if (std::isprint(static_cast<unsigned char>(Contents[addr + i]) & 0xFF)) + if (isPrint(static_cast<unsigned char>(Contents[addr + i]) & 0xFF)) outs() << Contents[addr + i]; else outs() << "."; diff --git a/tools/llvm-readobj/ObjDumper.cpp b/tools/llvm-readobj/ObjDumper.cpp index 17675fd8f27..a725140c9d3 100644 --- a/tools/llvm-readobj/ObjDumper.cpp +++ b/tools/llvm-readobj/ObjDumper.cpp @@ -29,7 +29,7 @@ ObjDumper::~ObjDumper() { static void printAsPrintable(raw_ostream &W, const uint8_t *Start, size_t Len) { for (size_t i = 0; i < Len; i++) - W << (isprint(Start[i]) ? static_cast<char>(Start[i]) : '.'); + W << (isPrint(Start[i]) ? static_cast<char>(Start[i]) : '.'); } static Expected<object::SectionRef> @@ -138,7 +138,7 @@ void ObjDumper::printSectionAsHex(const object::ObjectFile *Obj, TmpSecPtr = SecPtr; for (i = 0; TmpSecPtr + i < SecEnd && i < 16; ++i) - W.startLine() << (isprint(TmpSecPtr[i]) ? static_cast<char>(TmpSecPtr[i]) + W.startLine() << (isPrint(TmpSecPtr[i]) ? static_cast<char>(TmpSecPtr[i]) : '.'); W.startLine() << '\n'; |