diff options
| author | emaste <emaste@FreeBSD.org> | 2014-11-26 16:48:12 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-11-26 16:48:12 +0000 |
| commit | 0147dda7de9580d13778ecb4c9e92b83b7a63911 (patch) | |
| tree | b16dc95f693ed59342b6141cd3fd9f59a6cd7e7e /contrib/llvm/tools/lldb/source/DataFormatters/CF.cpp | |
| parent | bfd4c39c61ae9b29542625bb12b6f7f4b1f8c727 (diff) | |
| parent | 01ee1789d6aa7294e5966a97f8d29387f6f81699 (diff) | |
| download | FreeBSD-src-0147dda7de9580d13778ecb4c9e92b83b7a63911.zip FreeBSD-src-0147dda7de9580d13778ecb4c9e92b83b7a63911.tar.gz | |
Update LLDB snapshot to upstream r216948 (git 50f7fe44)
This is approximately "LLDB 3.5" although with a little bit of skew,
and will go along with the Clang 3.5 import.
Sponsored by: DARPA, AFRL
Diffstat (limited to 'contrib/llvm/tools/lldb/source/DataFormatters/CF.cpp')
| -rw-r--r-- | contrib/llvm/tools/lldb/source/DataFormatters/CF.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/CF.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/CF.cpp index a4b7a12..e131b68 100644 --- a/contrib/llvm/tools/lldb/source/DataFormatters/CF.cpp +++ b/contrib/llvm/tools/lldb/source/DataFormatters/CF.cpp @@ -85,7 +85,7 @@ lldb_private::formatters::CFBagSummaryProvider (ValueObject& valobj, Stream& str ValueObjectSP count_sp; StreamString expr; expr.Printf("(int)CFBagGetCount((void*)0x%" PRIx64 ")",valobj.GetPointerValue()); - if (process_sp->GetTarget().EvaluateExpression(expr.GetData(), frame_sp.get(), count_sp) != eExecutionCompleted) + if (process_sp->GetTarget().EvaluateExpression(expr.GetData(), frame_sp.get(), count_sp) != eExpressionCompleted) return false; if (!count_sp) return false; @@ -160,7 +160,7 @@ lldb_private::formatters::CFBitVectorSummaryProvider (ValueObject& valobj, Strea if (error.Fail() || num_bytes == 0) return false; uint8_t *bytes = buffer_sp->GetBytes(); - for (int byte_idx = 0; byte_idx < num_bytes-1; byte_idx++) + for (uint64_t byte_idx = 0; byte_idx < num_bytes-1; byte_idx++) { uint8_t byte = bytes[byte_idx]; bool bit0 = (byte & 1) == 1; @@ -279,7 +279,7 @@ lldb_private::formatters::CFBinaryHeapSummaryProvider (ValueObject& valobj, Stre ValueObjectSP count_sp; StreamString expr; expr.Printf("(int)CFBinaryHeapGetCount((void*)0x%" PRIx64 ")",valobj.GetPointerValue()); - if (process_sp->GetTarget().EvaluateExpression(expr.GetData(), frame_sp.get(), count_sp) != eExecutionCompleted) + if (process_sp->GetTarget().EvaluateExpression(expr.GetData(), frame_sp.get(), count_sp) != eExpressionCompleted) return false; if (!count_sp) return false; |
