[Lldb-commits] [lldb] r280697 - Fix build breakage in r280692

[Pavel Labath via lldb-commits]

Author: labath
Date: Tue Sep  6 05:04:22 2016
New Revision: 280697

URL: http://llvm.org/viewvc/llvm-project?rev=280697&view=rev
Log:
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.

Modified:
    lldb/trunk/include/lldb/Core/Disassembler.h
    lldb/trunk/source/Target/Process.cpp
    lldb/trunk/source/Target/StackFrame.cpp

Modified: lldb/trunk/include/lldb/Core/Disassembler.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Disassembler.h?rev=280697&r1=280696&r2=280697&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Disassembler.h (original)
+++ lldb/trunk/include/lldb/Core/Disassembler.h Tue Sep  6 05:04:22 2016
@@ -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;

Modified: lldb/trunk/source/Target/Process.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=280697&r1=280696&r2=280697&view=diff
==============================================================================
--- lldb/trunk/source/Target/Process.cpp (original)
+++ lldb/trunk/source/Target/Process.cpp Tue Sep  6 05:04:22 2016
@@ -1259,7 +1259,7 @@ Process::HandleProcessStateChangedEvent
                                 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);
                             }
                         }
                     }

Modified: lldb/trunk/source/Target/StackFrame.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/StackFrame.cpp?rev=280697&r1=280696&r2=280697&view=diff
==============================================================================
--- lldb/trunk/source/Target/StackFrame.cpp (original)
+++ lldb/trunk/source/Target/StackFrame.cpp Tue Sep  6 05:04:22 2016
@@ -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();
         }