From e81d9d49145e432d917eea3a70d2ae74dcad1d89 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 30 Dec 2015 11:55:28 +0000 Subject: Vendor import of stripped lldb trunk r256633: https://llvm.org/svn/llvm-project/lldb/trunk@256633 --- source/Expression/IRInterpreter.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source/Expression/IRInterpreter.cpp') diff --git a/source/Expression/IRInterpreter.cpp b/source/Expression/IRInterpreter.cpp index 926d1f22b6aa..a2b0c5b86851 100644 --- a/source/Expression/IRInterpreter.cpp +++ b/source/Expression/IRInterpreter.cpp @@ -365,7 +365,7 @@ public: const uint64_t *raw_data = resolved_value.getRawData(); - buffer.PutRawBytes(raw_data, constant_size, lldb::endian::InlHostByteOrder()); + buffer.PutRawBytes(raw_data, constant_size, lldb_private::endian::InlHostByteOrder()); lldb_private::Error write_error; @@ -498,7 +498,7 @@ IRInterpreter::CanInterpret (llvm::Module &module, default: { if (log) - log->Printf("Unsupported instruction: %s", PrintValue(ii).c_str()); + log->Printf("Unsupported instruction: %s", PrintValue(&*ii).c_str()); error.SetErrorToGenericError(); error.SetErrorString(unsupported_opcode_error); return false; @@ -522,7 +522,7 @@ IRInterpreter::CanInterpret (llvm::Module &module, if (!CanIgnoreCall(call_inst) && !support_function_calls) { if (log) - log->Printf("Unsupported instruction: %s", PrintValue(ii).c_str()); + log->Printf("Unsupported instruction: %s", PrintValue(&*ii).c_str()); error.SetErrorToGenericError(); error.SetErrorString(unsupported_opcode_error); return false; @@ -547,7 +547,7 @@ IRInterpreter::CanInterpret (llvm::Module &module, default: { if (log) - log->Printf("Unsupported ICmp predicate: %s", PrintValue(ii).c_str()); + log->Printf("Unsupported ICmp predicate: %s", PrintValue(&*ii).c_str()); error.SetErrorToGenericError(); error.SetErrorString(unsupported_opcode_error); @@ -655,7 +655,7 @@ IRInterpreter::Interpret (llvm::Module &module, ai != ae; ++ai, ++arg_index) { - if (args.size() < static_cast(arg_index)) + if (args.size() <= static_cast(arg_index)) { error.SetErrorString ("Not enough arguments passed in to function"); return false; @@ -663,16 +663,16 @@ IRInterpreter::Interpret (llvm::Module &module, lldb::addr_t ptr = args[arg_index]; - frame.MakeArgument(ai, ptr); + frame.MakeArgument(&*ai, ptr); } uint32_t num_insts = 0; - frame.Jump(function.begin()); + frame.Jump(&function.front()); while (frame.m_ii != frame.m_ie && (++num_insts < 4096)) { - const Instruction *inst = frame.m_ii; + const Instruction *inst = &*frame.m_ii; if (log) log->Printf("Interpreting %s", PrintValue(inst).c_str()); -- cgit v1.2.3