summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2016-09-06 10:04:22 +0000
committerPavel Labath <labath@google.com>2016-09-06 10:04:22 +0000
commit5cf1ece222936a0b7d6cc053c6db71a1956412d9 (patch)
tree250178c5b661f2870e1592ce56260be3849784a2
parent4fa3b50fc38fb5665c40aea11c91e8e020be221e (diff)
downloadbcm5719-llvm-5cf1ece222936a0b7d6cc053c6db71a1956412d9.tar.gz
bcm5719-llvm-5cf1ece222936a0b7d6cc053c6db71a1956412d9.zip
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
-rw-r--r--lldb/include/lldb/Core/Disassembler.h2
-rw-r--r--lldb/source/Target/Process.cpp2
-rw-r--r--lldb/source/Target/StackFrame.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/lldb/include/lldb/Core/Disassembler.h b/lldb/include/lldb/Core/Disassembler.h
index 7b11f480e97..fbe8fe00aca 100644
--- a/lldb/include/lldb/Core/Disassembler.h
+++ b/lldb/include/lldb/Core/Disassembler.h
@@ -193,7 +193,7 @@ public:
Sum,
Product
} m_type = Type::Invalid;
- std::vector<const Operand> m_children;
+ std::vector<Operand> m_children;
lldb::addr_t m_immediate = 0;
ConstString m_register;
bool m_negative = false;
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index b40502995b6..302d5bad7fa 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -1259,7 +1259,7 @@ Process::HandleProcessStateChangedEvent (const EventSP &event_sp,
const ValueObject::GetExpressionPathFormat format = ValueObject::GetExpressionPathFormat::eGetExpressionPathFormatHonorPointers;
stream->PutCString("Likely cause: ");
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);
}
}
}
diff --git a/lldb/source/Target/StackFrame.cpp b/lldb/source/Target/StackFrame.cpp
index aaf0a4d7ac7..887207199e2 100644
--- a/lldb/source/Target/StackFrame.cpp
+++ b/lldb/source/Target/StackFrame.cpp
@@ -1564,7 +1564,7 @@ namespace
ValueObjectSP
GetValueForOffset(StackFrame &frame, ValueObjectSP &parent, int64_t offset)
{
- if (offset < 0 || offset >= parent->GetByteSize())
+ if (offset < 0 || uint64_t(offset) >= parent->GetByteSize())
{
return ValueObjectSP();
}
OpenPOWER on IntegriCloud