From 786065d5886b43cdb67b327b5e76f6ac2a56f796 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 27 Nov 2017 15:22:38 +0000 Subject: Merging r316106: ------------------------------------------------------------------------ r316106 | labath | 2017-10-18 11:52:16 -0700 (Wed, 18 Oct 2017) | 4 lines lldb-server tests: Fix undefined behavior We were creating a StringRef pointing to a temporary string. Problem manifested itself when running the test on osx. ------------------------------------------------------------------------ llvm-svn: 319035 --- lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp b/lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp index 9fcb420..6ac067b 100644 --- a/lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp +++ b/lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp @@ -67,8 +67,8 @@ StringRef ThreadInfo::ReadRegister(unsigned int register_id) const { bool ThreadInfo::ReadRegisterAsUint64(unsigned int register_id, uint64_t &value) const { - StringRef value_str(m_registers.lookup(register_id)); - if (value_str.getAsInteger(16, value)) { + std::string value_str(m_registers.lookup(register_id)); + if (!llvm::to_integer(value_str, value, 16)) { GTEST_LOG_(ERROR) << formatv("ThreadInfo: Unable to parse register value at {0}.", register_id) -- cgit v1.1