Skip to content
This repository was archived by the owner on Apr 2, 2020. It is now read-only.

Commit 723e9e5

Browse files
committed
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. git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@280697 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 1bfce2a commit 723e9e5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

include/lldb/Core/Disassembler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class Instruction
193193
Sum,
194194
Product
195195
} m_type = Type::Invalid;
196-
std::vector<const Operand> m_children;
196+
std::vector<Operand> m_children;
197197
lldb::addr_t m_immediate = 0;
198198
ConstString m_register;
199199
bool m_negative = false;

source/Target/Process.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ Process::HandleProcessStateChangedEvent (const EventSP &event_sp,
12591259
const ValueObject::GetExpressionPathFormat format = ValueObject::GetExpressionPathFormat::eGetExpressionPathFormatHonorPointers;
12601260
stream->PutCString("Likely cause: ");
12611261
valobj_sp->GetExpressionPath(*stream, qualify_cxx_base_classes, format);
1262-
stream->Printf(" accessed 0x%llx\n", crashing_address);
1262+
stream->Printf(" accessed 0x%" PRIx64 "\n", crashing_address);
12631263
}
12641264
}
12651265
}

source/Target/StackFrame.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,7 @@ namespace
15641564
ValueObjectSP
15651565
GetValueForOffset(StackFrame &frame, ValueObjectSP &parent, int64_t offset)
15661566
{
1567-
if (offset < 0 || offset >= parent->GetByteSize())
1567+
if (offset < 0 || uint64_t(offset) >= parent->GetByteSize())
15681568
{
15691569
return ValueObjectSP();
15701570
}

0 commit comments

Comments
 (0)