aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-12-02 12:47:31 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-12-02 12:47:31 +0000
commit76e0736e7fcfeb179779e49c05604464b1ccd704 (patch)
treecbf6307afffa1845bfaa2a5702188806da3c5496
parent50640c91565c298232ed5d2dacc018dd0e11116c (diff)
downloadsrc-76e0736e7fcfeb179779e49c05604464b1ccd704.tar.gz
src-76e0736e7fcfeb179779e49c05604464b1ccd704.zip
Vendor import of lldb release_50 branch r319231:vendor/lldb/lldb-release_501-r320880vendor/lldb/lldb-release_50-r319231
Notes
Notes: svn path=/vendor/lldb/dist/; revision=326469 svn path=/vendor/lldb/lldb-release_501-r320880/; revision=326907; tag=vendor/lldb/lldb-release_501-r320880
-rw-r--r--source/Expression/IRExecutionUnit.cpp3
-rw-r--r--unittests/tools/lldb-server/tests/MessageObjects.cpp4
2 files changed, 3 insertions, 4 deletions
diff --git a/source/Expression/IRExecutionUnit.cpp b/source/Expression/IRExecutionUnit.cpp
index e31483f1728d..363e6fe8678f 100644
--- a/source/Expression/IRExecutionUnit.cpp
+++ b/source/Expression/IRExecutionUnit.cpp
@@ -282,8 +282,7 @@ void IRExecutionUnit::GetRunnableInfo(Status &error, lldb::addr_t &func_addr,
.setMCJITMemoryManager(
std::unique_ptr<MemoryManager>(new MemoryManager(*this)))
.setCodeModel(codeModel)
- .setOptLevel(llvm::CodeGenOpt::Less)
- .setUseOrcMCJITReplacement(true);
+ .setOptLevel(llvm::CodeGenOpt::Less);
llvm::StringRef mArch;
llvm::StringRef mCPU;
diff --git a/unittests/tools/lldb-server/tests/MessageObjects.cpp b/unittests/tools/lldb-server/tests/MessageObjects.cpp
index 9fcb4207675a..6ac067bce062 100644
--- a/unittests/tools/lldb-server/tests/MessageObjects.cpp
+++ b/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)