maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix build breakage in r280692 

The commit introduced an array of const objects, which libstdc++ does not like. Make the object
non-const.

Also fix a compiler warning while I'm in there.

llvm-svn: 280697
This commit is contained in:
Pavel Labath 2016-09-06 10:04:22 +00:00
parent 4fa3b50fc3
commit 5cf1ece222
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/Core/Disassembler.h
View File

@ -193,7 +193,7 @@ public:
Sum, Sum,
Product Product
} m_type = Type::Invalid; } m_type = Type::Invalid;
std::vector<const Operand> m_children; std::vector<Operand> m_children;
lldb::addr_t m_immediate = 0; lldb::addr_t m_immediate = 0;
ConstString m_register; ConstString m_register;
bool m_negative = false; bool m_negative = false;

2
lldb/source/Target/Process.cpp
View File

@ -1259,7 +1259,7 @@ Process::HandleProcessStateChangedEvent (const EventSP &event_sp,
const ValueObject::GetExpressionPathFormat format = ValueObject::GetExpressionPathFormat::eGetExpressionPathFormatHonorPointers; const ValueObject::GetExpressionPathFormat format = ValueObject::GetExpressionPathFormat::eGetExpressionPathFormatHonorPointers;
stream->PutCString("Likely cause: "); stream->PutCString("Likely cause: ");
valobj_sp->GetExpressionPath(*stream, qualify_cxx_base_classes, format); valobj_sp->GetExpressionPath(*stream, qualify_cxx_base_classes, format);
stream->Printf(" accessed 0x%llx\n", crashing_address); stream->Printf(" accessed 0x%" PRIx64 "\n", crashing_address);
} }
} }
} }

2
lldb/source/Target/StackFrame.cpp
View File

@ -1564,7 +1564,7 @@ namespace
ValueObjectSP ValueObjectSP
GetValueForOffset(StackFrame &frame, ValueObjectSP &parent, int64_t offset) GetValueForOffset(StackFrame &frame, ValueObjectSP &parent, int64_t offset)
{ {
if (offset < 0 || offset >= parent->GetByteSize()) if (offset < 0 || uint64_t(offset) >= parent->GetByteSize())
{ {
return ValueObjectSP(); return ValueObjectSP();
} }