svn commit: r326469 - in vendor/lldb/dist: source/Expression unittests/tools/lldb-server/tests

[Dimitry Andric]

Author: dim
Date: Sat Dec  2 12:47:31 2017
New Revision: 326469
URL: https://svnweb.freebsd.org/changeset/base/326469

Log:
  Vendor import of lldb release_50 branch r319231:
  https://llvm.org/svn/llvm-project/lldb/branches/release_50@319231

Modified:
  vendor/lldb/dist/source/Expression/IRExecutionUnit.cpp
  vendor/lldb/dist/unittests/tools/lldb-server/tests/MessageObjects.cpp

Modified: vendor/lldb/dist/source/Expression/IRExecutionUnit.cpp
==============================================================================
--- vendor/lldb/dist/source/Expression/IRExecutionUnit.cpp	Sat Dec  2 12:47:23 2017	(r326468)
+++ vendor/lldb/dist/source/Expression/IRExecutionUnit.cpp	Sat Dec  2 12:47:31 2017	(r326469)
@@ -282,8 +282,7 @@ void IRExecutionUnit::GetRunnableInfo(Status &error, l
       .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;

Modified: vendor/lldb/dist/unittests/tools/lldb-server/tests/MessageObjects.cpp
==============================================================================
--- vendor/lldb/dist/unittests/tools/lldb-server/tests/MessageObjects.cpp	Sat Dec  2 12:47:23 2017	(r326468)
+++ vendor/lldb/dist/unittests/tools/lldb-server/tests/MessageObjects.cpp	Sat Dec  2 12:47:31 2017	(r326469)
@@ -67,8 +67,8 @@ StringRef ThreadInfo::ReadRegister(unsigned int regist
 
 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)