<rdar://problem/13421412>
Many "byte size" members and variables were using a mixture of uint32_t and size_t. Switching over to using uint64_t everywhere.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@177091 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/API/SBType.cpp b/source/API/SBType.cpp
index 976bbf2..4914dae 100644
--- a/source/API/SBType.cpp
+++ b/source/API/SBType.cpp
@@ -136,7 +136,7 @@
return m_opaque_sp->IsValid();
}
-size_t
+uint64_t
SBType::GetByteSize()
{
if (!IsValid())
diff --git a/source/Commands/CommandObjectMemory.cpp b/source/Commands/CommandObjectMemory.cpp
index 47ddc51..ea8feed 100644
--- a/source/Commands/CommandObjectMemory.cpp
+++ b/source/Commands/CommandObjectMemory.cpp
@@ -538,7 +538,7 @@
--pointer_count;
}
- m_format_options.GetByteSizeValue() = (clang_ast_type.GetClangTypeBitWidth () + 7) / 8;
+ m_format_options.GetByteSizeValue() = clang_ast_type.GetClangTypeByteSize();
if (m_format_options.GetByteSizeValue() == 0)
{
diff --git a/source/Core/DataBufferHeap.cpp b/source/Core/DataBufferHeap.cpp
index a93427f..3692aa9 100644
--- a/source/Core/DataBufferHeap.cpp
+++ b/source/Core/DataBufferHeap.cpp
@@ -23,7 +23,7 @@
// Initialize this class with "n" characters and fill the buffer
// with "ch".
//----------------------------------------------------------------------
-DataBufferHeap::DataBufferHeap (size_t n, uint8_t ch) :
+DataBufferHeap::DataBufferHeap (lldb::offset_t n, uint8_t ch) :
m_data(n, ch)
{
}
@@ -32,7 +32,7 @@
// Initialize this class with a copy of the "n" bytes from the "bytes"
// buffer.
//----------------------------------------------------------------------
-DataBufferHeap::DataBufferHeap (const void *src, size_t src_len) :
+DataBufferHeap::DataBufferHeap (const void *src, lldb::offset_t src_len) :
m_data()
{
CopyData (src, src_len);
@@ -73,7 +73,7 @@
//----------------------------------------------------------------------
// Return the number of bytes this object currently contains.
//----------------------------------------------------------------------
-size_t
+uint64_t
DataBufferHeap::GetByteSize () const
{
return m_data.size();
@@ -84,15 +84,15 @@
// Sets the number of bytes that this object should be able to
// contain. This can be used prior to copying data into the buffer.
//----------------------------------------------------------------------
-size_t
-DataBufferHeap::SetByteSize (size_t new_size)
+uint64_t
+DataBufferHeap::SetByteSize (uint64_t new_size)
{
m_data.resize(new_size);
return m_data.size();
}
void
-DataBufferHeap::CopyData (const void *src, size_t src_len)
+DataBufferHeap::CopyData (const void *src, uint64_t src_len)
{
const uint8_t *src_u8 = (const uint8_t *)src;
if (src && src_len > 0)
diff --git a/source/Core/DataBufferMemoryMap.cpp b/source/Core/DataBufferMemoryMap.cpp
index 19dcf77..d1131ae 100644
--- a/source/Core/DataBufferMemoryMap.cpp
+++ b/source/Core/DataBufferMemoryMap.cpp
@@ -68,7 +68,7 @@
//----------------------------------------------------------------------
// Return the number of bytes this object currently contains.
//----------------------------------------------------------------------
-size_t
+uint64_t
DataBufferMemoryMap::GetByteSize() const
{
return m_size;
@@ -104,8 +104,8 @@
//----------------------------------------------------------------------
size_t
DataBufferMemoryMap::MemoryMapFromFileSpec (const FileSpec* filespec,
- off_t offset,
- size_t length,
+ lldb::offset_t offset,
+ lldb::offset_t length,
bool writeable)
{
if (filespec != NULL)
@@ -113,7 +113,7 @@
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_MMAP));
if (log)
{
- log->Printf("DataBufferMemoryMap::MemoryMapFromFileSpec(file=\"%s/%s\", offset=0x%" PRIx64 ", length=0x%zx, writeable=%i",
+ log->Printf("DataBufferMemoryMap::MemoryMapFromFileSpec(file=\"%s/%s\", offset=0x%" PRIx64 ", length=0x%" PRIx64 ", writeable=%i",
filespec->GetDirectory().GetCString(),
filespec->GetFilename().GetCString(),
offset,
@@ -156,8 +156,8 @@
//----------------------------------------------------------------------
size_t
DataBufferMemoryMap::MemoryMapFromFileDescriptor (int fd,
- off_t offset,
- size_t length,
+ lldb::offset_t offset,
+ lldb::offset_t length,
bool writeable,
bool fd_is_file)
{
@@ -167,7 +167,7 @@
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_MMAP|LIBLLDB_LOG_VERBOSE));
if (log)
{
- log->Printf("DataBufferMemoryMap::MemoryMapFromFileSpec(fd=%i, offset=0x%" PRIx64 ", length=0x%zx, writeable=%i, fd_is_file=%i)",
+ log->Printf("DataBufferMemoryMap::MemoryMapFromFileSpec(fd=%i, offset=0x%" PRIx64 ", length=0x%" PRIx64 ", writeable=%i, fd_is_file=%i)",
fd,
offset,
length,
diff --git a/source/Core/Value.cpp b/source/Core/Value.cpp
index 5b6e8fd..f529809 100644
--- a/source/Core/Value.cpp
+++ b/source/Core/Value.cpp
@@ -169,10 +169,10 @@
return false;
}
-size_t
+uint64_t
Value::GetValueByteSize (clang::ASTContext *ast_context, Error *error_ptr)
{
- size_t byte_size = 0;
+ uint64_t byte_size = 0;
switch (m_context_type)
{
@@ -190,8 +190,7 @@
}
else
{
- uint64_t bit_width = ClangASTType::GetClangTypeBitWidth (ast_context, m_context);
- byte_size = (bit_width + 7 ) / 8;
+ byte_size = ClangASTType(ast_context, m_context).GetClangTypeByteSize();
}
break;
@@ -348,9 +347,8 @@
data.SetByteOrder (lldb::endian::InlHostByteOrder());
if (m_context_type == eContextTypeClangType && ast_context)
{
- uint32_t ptr_bit_width = ClangASTType::GetClangTypeBitWidth (ast_context,
- ClangASTContext::GetVoidPtrType(ast_context, false));
- uint32_t ptr_byte_size = (ptr_bit_width + 7) / 8;
+ ClangASTType ptr_type (ast_context, ClangASTContext::GetVoidPtrType(ast_context, false));
+ uint64_t ptr_byte_size = ptr_type.GetClangTypeByteSize();
data.SetAddressByteSize (ptr_byte_size);
}
else
diff --git a/source/Core/ValueObject.cpp b/source/Core/ValueObject.cpp
index 7891c26..fb3c9b3 100644
--- a/source/Core/ValueObject.cpp
+++ b/source/Core/ValueObject.cpp
@@ -998,7 +998,7 @@
return 0;
}
-size_t
+uint64_t
ValueObject::GetData (DataExtractor& data)
{
UpdateValueIfNeeded(false);
@@ -1717,7 +1717,7 @@
return false;
}
- uint32_t count = 0;
+ uint64_t count = 0;
Encoding encoding = ClangASTType::GetEncoding (GetClangType(), count);
const size_t byte_size = GetByteSize();
diff --git a/source/Core/ValueObjectCast.cpp b/source/Core/ValueObjectCast.cpp
index 6abf836..e1c94cc 100644
--- a/source/Core/ValueObjectCast.cpp
+++ b/source/Core/ValueObjectCast.cpp
@@ -79,7 +79,7 @@
return m_cast_type.GetASTContext();
}
-size_t
+uint64_t
ValueObjectCast::GetByteSize()
{
return m_value.GetValueByteSize(GetClangAST(), NULL);
diff --git a/source/Core/ValueObjectChild.cpp b/source/Core/ValueObjectChild.cpp
index ee2bbb5..8aeb005 100644
--- a/source/Core/ValueObjectChild.cpp
+++ b/source/Core/ValueObjectChild.cpp
@@ -30,7 +30,7 @@
clang::ASTContext *clang_ast,
void *clang_type,
const ConstString &name,
- uint32_t byte_size,
+ uint64_t byte_size,
int32_t byte_offset,
uint32_t bitfield_bit_size,
uint32_t bitfield_bit_offset,
diff --git a/source/Core/ValueObjectConstResult.cpp b/source/Core/ValueObjectConstResult.cpp
index 4a9dfbe..b78e4ec 100644
--- a/source/Core/ValueObjectConstResult.cpp
+++ b/source/Core/ValueObjectConstResult.cpp
@@ -286,7 +286,7 @@
return eValueTypeConstResult;
}
-size_t
+uint64_t
ValueObjectConstResult::GetByteSize()
{
if (m_byte_size == 0)
diff --git a/source/Core/ValueObjectDynamicValue.cpp b/source/Core/ValueObjectDynamicValue.cpp
index 06a7eed..a90ef02 100644
--- a/source/Core/ValueObjectDynamicValue.cpp
+++ b/source/Core/ValueObjectDynamicValue.cpp
@@ -106,7 +106,7 @@
return m_parent->GetClangAST ();
}
-size_t
+uint64_t
ValueObjectDynamicValue::GetByteSize()
{
const bool success = UpdateValueIfNeeded(false);
diff --git a/source/Core/ValueObjectMemory.cpp b/source/Core/ValueObjectMemory.cpp
index 325dc88..2bdf44f 100644
--- a/source/Core/ValueObjectMemory.cpp
+++ b/source/Core/ValueObjectMemory.cpp
@@ -165,12 +165,12 @@
return m_clang_type.GetASTContext();
}
-size_t
+uint64_t
ValueObjectMemory::GetByteSize()
{
if (m_type_sp)
return m_type_sp->GetByteSize();
- return (m_clang_type.GetClangTypeBitWidth () + 7) / 8;
+ return m_clang_type.GetClangTypeByteSize ();
}
lldb::ValueType
diff --git a/source/Core/ValueObjectRegister.cpp b/source/Core/ValueObjectRegister.cpp
index 95a6315..9ac8aa4 100644
--- a/source/Core/ValueObjectRegister.cpp
+++ b/source/Core/ValueObjectRegister.cpp
@@ -72,7 +72,7 @@
return NULL;
}
-size_t
+uint64_t
ValueObjectRegisterContext::GetByteSize()
{
return 0;
@@ -177,7 +177,7 @@
return NULL;
}
-size_t
+uint64_t
ValueObjectRegisterSet::GetByteSize()
{
return 0;
@@ -361,7 +361,7 @@
return NULL;
}
-size_t
+uint64_t
ValueObjectRegister::GetByteSize()
{
return m_reg_info.byte_size;
diff --git a/source/Core/ValueObjectSyntheticFilter.cpp b/source/Core/ValueObjectSyntheticFilter.cpp
index c8edffa..ab5d1f5 100644
--- a/source/Core/ValueObjectSyntheticFilter.cpp
+++ b/source/Core/ValueObjectSyntheticFilter.cpp
@@ -135,7 +135,7 @@
return m_parent->GetClangAST ();
}
-size_t
+uint64_t
ValueObjectSynthetic::GetByteSize()
{
return m_parent->GetByteSize();
diff --git a/source/Core/ValueObjectVariable.cpp b/source/Core/ValueObjectVariable.cpp
index 5647fbb..164592d 100644
--- a/source/Core/ValueObjectVariable.cpp
+++ b/source/Core/ValueObjectVariable.cpp
@@ -102,16 +102,15 @@
return 0;
}
-size_t
+uint64_t
ValueObjectVariable::GetByteSize()
{
- ClangASTType type(GetClangAST(),
- GetClangType());
+ ClangASTType type(GetClangAST(), GetClangType());
if (!type.IsValid())
return 0;
- return (ClangASTType::GetClangTypeBitWidth(type.GetASTContext(), type.GetOpaqueQualType()) + 7) / 8;
+ return type.GetClangTypeByteSize();
}
lldb::ValueType
diff --git a/source/Expression/DWARFExpression.cpp b/source/Expression/DWARFExpression.cpp
index a6950d6..82d40af 100644
--- a/source/Expression/DWARFExpression.cpp
+++ b/source/Expression/DWARFExpression.cpp
@@ -2794,7 +2794,7 @@
addr_t source_addr = (addr_t)tmp.GetScalar().ULongLong();
addr_t target_addr = (addr_t)stack.back().GetScalar().ULongLong();
- size_t byte_size = (ClangASTType::GetClangTypeBitWidth(ast_context, clang_type) + 7) / 8;
+ const uint64_t byte_size = ClangASTType::GetTypeByteSize(ast_context, clang_type);
switch (source_value_type)
{
diff --git a/source/Expression/IRForTarget.cpp b/source/Expression/IRForTarget.cpp
index 8f775a7..c7c96f7 100644
--- a/source/Expression/IRForTarget.cpp
+++ b/source/Expression/IRForTarget.cpp
@@ -707,7 +707,7 @@
m_result_name = m_decl_map->GetPersistentResultName();
if (log)
- log->Printf("Creating a new result global: \"%s\" with size 0x%x",
+ log->Printf("Creating a new result global: \"%s\" with size 0x%" PRIx64,
m_result_name.GetCString(),
m_result_type.GetClangTypeBitWidth() / 8);
@@ -1674,11 +1674,11 @@
value_type = global_variable->getType();
}
- size_t value_size = (ast_context->getTypeSize(qual_type) + 7) / 8;
- off_t value_alignment = (ast_context->getTypeAlign(qual_type) + 7) / 8;
+ uint64_t value_size = (ast_context->getTypeSize(qual_type) + 7ull) / 8ull;
+ off_t value_alignment = (ast_context->getTypeAlign(qual_type) + 7ull) / 8ull;
if (log)
- log->Printf("Type of \"%s\" is [clang \"%s\", llvm \"%s\"] [size %lu, align %" PRId64 "]",
+ log->Printf("Type of \"%s\" is [clang \"%s\", llvm \"%s\"] [size %" PRIu64 ", align %" PRId64 "]",
name.c_str(),
qual_type.getAsString().c_str(),
PrintType(value_type).c_str(),
diff --git a/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index ba28699..53e99d7 100644
--- a/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -5442,7 +5442,7 @@
const char *type_name_cstr = NULL;
ConstString type_name_const_str;
Type::ResolveState resolve_state = Type::eResolveStateUnresolved;
- size_t byte_size = 0;
+ uint64_t byte_size = 0;
Declaration decl;
Type::EncodingDataType encoding_data_type = Type::eEncodingIsUID;
diff --git a/source/Symbol/ClangASTContext.cpp b/source/Symbol/ClangASTContext.cpp
index e1bc3c2..0b8465e 100644
--- a/source/Symbol/ClangASTContext.cpp
+++ b/source/Symbol/ClangASTContext.cpp
@@ -5598,7 +5598,7 @@
return NULL;
}
-uint32_t
+uint64_t
ClangASTContext::GetPointerBitSize ()
{
ASTContext *ast = getASTContext();
diff --git a/source/Symbol/ClangASTType.cpp b/source/Symbol/ClangASTType.cpp
index 5c6b8da..721672e 100644
--- a/source/Symbol/ClangASTType.cpp
+++ b/source/Symbol/ClangASTType.cpp
@@ -141,7 +141,7 @@
}
lldb::clang_type_t
-ClangASTType::GetArrayElementType (uint32_t& stride)
+ClangASTType::GetArrayElementType (uint64_t& stride)
{
return GetArrayElementType(m_ast, m_type, stride);
}
@@ -149,7 +149,7 @@
lldb::clang_type_t
ClangASTType::GetArrayElementType (clang::ASTContext* ast,
lldb::clang_type_t opaque_clang_qual_type,
- uint32_t& stride)
+ uint64_t& stride)
{
if (opaque_clang_qual_type)
{
@@ -187,7 +187,7 @@
}
lldb::Encoding
-ClangASTType::GetEncoding (uint32_t &count)
+ClangASTType::GetEncoding (uint64_t &count)
{
return GetEncoding(m_type, count);
}
@@ -363,7 +363,7 @@
}
lldb::Encoding
-ClangASTType::GetEncoding (clang_type_t clang_type, uint32_t &count)
+ClangASTType::GetEncoding (clang_type_t clang_type, uint64_t &count)
{
count = 1;
clang::QualType qual_type(clang::QualType::getFromOpaquePtr(clang_type));
@@ -631,7 +631,7 @@
Stream *s,
lldb::Format format,
const lldb_private::DataExtractor &data,
- uint32_t data_byte_offset,
+ lldb::offset_t data_byte_offset,
size_t data_byte_size,
uint32_t bitfield_bit_size,
uint32_t bitfield_bit_offset,
@@ -667,7 +667,7 @@
Stream *s,
lldb::Format format,
const lldb_private::DataExtractor &data,
- uint32_t data_byte_offset,
+ lldb::offset_t data_byte_offset,
size_t data_byte_size,
uint32_t bitfield_bit_size,
uint32_t bitfield_bit_offset,
@@ -965,7 +965,7 @@
ClangASTType::DumpTypeValue (Stream *s,
lldb::Format format,
const lldb_private::DataExtractor &data,
- uint32_t byte_offset,
+ lldb::offset_t byte_offset,
size_t byte_size,
uint32_t bitfield_bit_size,
uint32_t bitfield_bit_offset,
@@ -990,7 +990,7 @@
Stream *s,
lldb::Format format,
const lldb_private::DataExtractor &data,
- uint32_t byte_offset,
+ lldb::offset_t byte_offset,
size_t byte_size,
uint32_t bitfield_bit_size,
uint32_t bitfield_bit_offset,
@@ -1153,7 +1153,7 @@
ExecutionContext *exe_ctx,
Stream *s,
const lldb_private::DataExtractor &data,
- uint32_t data_byte_offset,
+ lldb::offset_t data_byte_offset,
size_t data_byte_size
)
{
@@ -1174,7 +1174,7 @@
ExecutionContext *exe_ctx,
Stream *s,
const lldb_private::DataExtractor &data,
- uint32_t data_byte_offset,
+ lldb::offset_t data_byte_offset,
size_t data_byte_size
)
{
@@ -1219,19 +1219,19 @@
}
}
-uint32_t
+uint64_t
ClangASTType::GetClangTypeByteSize ()
{
return (GetClangTypeBitWidth (m_ast, m_type) + 7) / 8;
}
-uint32_t
+uint64_t
ClangASTType::GetClangTypeBitWidth ()
{
return GetClangTypeBitWidth (m_ast, m_type);
}
-uint32_t
+uint64_t
ClangASTType::GetClangTypeBitWidth (clang::ASTContext *ast_context, clang_type_t clang_type)
{
if (ClangASTContext::GetCompleteType (ast_context, clang_type))
@@ -1428,7 +1428,7 @@
ClangASTType::GetValueAsScalar
(
const lldb_private::DataExtractor &data,
- uint32_t data_byte_offset,
+ lldb::offset_t data_byte_offset,
size_t data_byte_size,
Scalar &value
)
@@ -1447,7 +1447,7 @@
clang::ASTContext *ast_context,
clang_type_t clang_type,
const lldb_private::DataExtractor &data,
- uint32_t data_byte_offset,
+ lldb::offset_t data_byte_offset,
size_t data_byte_size,
Scalar &value
)
@@ -1460,14 +1460,14 @@
}
else
{
- uint32_t count = 0;
+ uint64_t count = 0;
lldb::Encoding encoding = GetEncoding (clang_type, count);
if (encoding == lldb::eEncodingInvalid || count != 1)
return false;
uint64_t bit_width = ast_context->getTypeSize(qual_type);
- uint32_t byte_size = (bit_width + 7 ) / 8;
+ uint64_t byte_size = (bit_width + 7 ) / 8;
lldb::offset_t offset = data_byte_offset;
switch (encoding)
{
@@ -1603,18 +1603,18 @@
if (!ClangASTContext::IsAggregateType (clang_type))
{
strm.GetFlags().Set(Stream::eBinary);
- uint32_t count = 0;
+ uint64_t count = 0;
lldb::Encoding encoding = GetEncoding (clang_type, count);
if (encoding == lldb::eEncodingInvalid || count != 1)
return false;
- uint64_t bit_width = ast_context->getTypeSize(qual_type);
+ const uint64_t bit_width = ast_context->getTypeSize(qual_type);
// This function doesn't currently handle non-byte aligned assignments
if ((bit_width % 8) != 0)
return false;
- uint32_t byte_size = (bit_width + 7 ) / 8;
+ const uint64_t byte_size = (bit_width + 7 ) / 8;
switch (encoding)
{
case lldb::eEncodingInvalid:
@@ -1673,13 +1673,10 @@
}
bool
-ClangASTType::ReadFromMemory
-(
- lldb_private::ExecutionContext *exe_ctx,
- lldb::addr_t addr,
- AddressType address_type,
- lldb_private::DataExtractor &data
-)
+ClangASTType::ReadFromMemory (lldb_private::ExecutionContext *exe_ctx,
+ lldb::addr_t addr,
+ AddressType address_type,
+ lldb_private::DataExtractor &data)
{
return ReadFromMemory (m_ast,
m_type,
@@ -1689,24 +1686,21 @@
data);
}
-uint32_t
+uint64_t
ClangASTType::GetTypeByteSize() const
{
- return GetTypeByteSize(m_ast,
- m_type);
+ return GetTypeByteSize (m_ast, m_type);
}
-uint32_t
-ClangASTType::GetTypeByteSize(
- clang::ASTContext *ast_context,
- lldb::clang_type_t opaque_clang_qual_type)
+uint64_t
+ClangASTType::GetTypeByteSize(clang::ASTContext *ast_context, lldb::clang_type_t opaque_clang_qual_type)
{
if (ClangASTContext::GetCompleteType (ast_context, opaque_clang_qual_type))
{
clang::QualType qual_type(clang::QualType::getFromOpaquePtr(opaque_clang_qual_type));
- uint32_t byte_size = (ast_context->getTypeSize (qual_type) + 7) / 8;
+ uint64_t byte_size = (ast_context->getTypeSize (qual_type) + (uint64_t)7) / (uint64_t)8;
if (ClangASTContext::IsObjCClassType(opaque_clang_qual_type))
byte_size += ast_context->getTypeSize(ast_context->ObjCBuiltinClassTy) / 8; // isa
@@ -1718,15 +1712,12 @@
bool
-ClangASTType::ReadFromMemory
-(
- clang::ASTContext *ast_context,
- clang_type_t clang_type,
- lldb_private::ExecutionContext *exe_ctx,
- lldb::addr_t addr,
- AddressType address_type,
- lldb_private::DataExtractor &data
-)
+ClangASTType::ReadFromMemory (clang::ASTContext *ast_context,
+ clang_type_t clang_type,
+ lldb_private::ExecutionContext *exe_ctx,
+ lldb::addr_t addr,
+ AddressType address_type,
+ lldb_private::DataExtractor &data)
{
if (address_type == eAddressTypeFile)
{
@@ -1740,7 +1731,7 @@
clang::QualType qual_type(clang::QualType::getFromOpaquePtr(clang_type));
- const uint32_t byte_size = (ast_context->getTypeSize (qual_type) + 7) / 8;
+ const uint64_t byte_size = (ast_context->getTypeSize (qual_type) + 7) / 8;
if (data.GetByteSize() < byte_size)
{
lldb::DataBufferSP data_sp(new DataBufferHeap (byte_size, '\0'));
@@ -1808,7 +1799,7 @@
return false;
}
clang::QualType qual_type(clang::QualType::getFromOpaquePtr(clang_type));
- const uint32_t byte_size = (ast_context->getTypeSize (qual_type) + 7) / 8;
+ const uint64_t byte_size = (ast_context->getTypeSize (qual_type) + 7) / 8;
if (byte_size > 0)
{
diff --git a/source/Symbol/Type.cpp b/source/Symbol/Type.cpp
index bdd7ce8..e886f15 100644
--- a/source/Symbol/Type.cpp
+++ b/source/Symbol/Type.cpp
@@ -51,7 +51,7 @@
lldb::user_id_t uid,
SymbolFile* symbol_file,
const ConstString &name,
- uint32_t byte_size,
+ uint64_t byte_size,
SymbolContextScope *context,
user_id_t encoding_uid,
EncodingDataType encoding_uid_type,
@@ -138,7 +138,7 @@
// Call the get byte size accesor so we resolve our byte size
if (GetByteSize())
- s->Printf(", byte-size = %u", m_byte_size);
+ s->Printf(", byte-size = %" PRIu64, m_byte_size);
bool show_fullpaths = (level == lldb::eDescriptionLevelVerbose);
m_decl.Dump(s, show_fullpaths);
@@ -178,7 +178,7 @@
*s << ", name = \"" << m_name << "\"";
if (m_byte_size != 0)
- s->Printf(", size = %u", m_byte_size);
+ s->Printf(", size = %" PRIu64, m_byte_size);
if (show_context && m_context != NULL)
{
@@ -289,7 +289,7 @@
-uint32_t
+uint64_t
Type::GetByteSize()
{
if (m_byte_size == 0)
@@ -375,7 +375,7 @@
lldb::Encoding
-Type::GetEncoding (uint32_t &count)
+Type::GetEncoding (uint64_t &count)
{
// Make sure we resolve our type if it already hasn't been.
if (!ResolveClangType(eResolveStateForward))
@@ -426,7 +426,7 @@
return false;
}
- const uint32_t byte_size = GetByteSize();
+ const uint64_t byte_size = GetByteSize();
if (data.GetByteSize() < byte_size)
{
lldb::DataBufferSP data_sp(new DataBufferHeap (byte_size, '\0'));