diff options
| author | Tom Stellard <tstellar@redhat.com> | 2017-11-27 15:22:38 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2017-11-27 15:22:38 +0000 |
| commit | 786065d5886b43cdb67b327b5e76f6ac2a56f796 (patch) | |
| tree | a11142cb114fcf4e47e9b0908cff11a080581148 | |
| parent | 3f76a35b1f08c215c6b2ebfffb242ecf7d80b06e (diff) | |
| download | llvm-786065d5886b43cdb67b327b5e76f6ac2a56f796.zip llvm-786065d5886b43cdb67b327b5e76f6ac2a56f796.tar.gz llvm-786065d5886b43cdb67b327b5e76f6ac2a56f796.tar.bz2 | |
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
| -rw-r--r-- | lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp | 4 |
1 files 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) |