From bcfabaa05bc45d33e9ff60dca769150453956e83 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Wed, 2 Dec 2015 21:13:43 +0000 Subject: [PATCH] [Hexagon] Remove std::hex in favor of format(). std::hex is not used anywhere in LLVM code base except for this place, and it has a known undefined behavior (at least in libstdc++ 4.9.3): https://llvm.org/bugs/show_bug.cgi?id=18156, which fires in UBSan bootstrap of LLVM. llvm-svn: 254547 --- .../Target/Hexagon/AsmParser/HexagonAsmParser.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp b/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp index b73ec0bfb191..2e780f035b2b 100644 --- a/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp +++ b/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp @@ -38,6 +38,7 @@ #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ELF.h" +#include "llvm/Support/Format.h" #include "llvm/Support/SourceMgr.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/TargetRegistry.h" @@ -1511,14 +1512,15 @@ unsigned HexagonAsmParser::validateTargetOperandClass(MCParsedAsmOperand &AsmOp, } void HexagonAsmParser::OutOfRange(SMLoc IDLoc, long long Val, long long Max) { - std::stringstream errStr; - errStr << "value " << Val << "(0x" << std::hex << Val << std::dec + std::string errStr; + raw_string_ostream ES(errStr); + ES << "value " << Val << "(" << format("0x%" PRIx64, Val) << ") out of range: "; if (Max >= 0) - errStr << "0-" << Max; + ES << "0-" << Max; else - errStr << Max << "-" << (-Max - 1); - Error(IDLoc, errStr.str().c_str()); + ES << Max << "-" << (-Max - 1); + Error(IDLoc, ES.str().c_str()); } int HexagonAsmParser::processInstruction(MCInst &Inst,