Index: lldb/trunk/include/lldb/Symbol/Type.h =================================================================== --- lldb/trunk/include/lldb/Symbol/Type.h +++ lldb/trunk/include/lldb/Symbol/Type.h @@ -95,7 +95,7 @@ } ResolveState; Type(lldb::user_id_t uid, SymbolFile *symbol_file, const ConstString &name, - uint64_t byte_size, SymbolContextScope *context, + llvm::Optional byte_size, SymbolContextScope *context, lldb::user_id_t encoding_uid, EncodingDataType encoding_uid_type, const Declaration &decl, const CompilerType &compiler_qual_type, ResolveState compiler_type_resolve_state); @@ -127,7 +127,7 @@ const ConstString &GetName(); - uint64_t GetByteSize(); + llvm::Optional GetByteSize(); uint32_t GetNumChildren(bool omit_empty_base_classes); @@ -217,7 +217,8 @@ Type *m_encoding_type; lldb::user_id_t m_encoding_uid; EncodingDataType m_encoding_uid_type; - uint64_t m_byte_size; + uint64_t m_byte_size : 63; + uint64_t m_byte_size_has_value : 1; Declaration m_decl; CompilerType m_compiler_type; Index: lldb/trunk/source/Core/ValueObjectMemory.cpp =================================================================== --- lldb/trunk/source/Core/ValueObjectMemory.cpp +++ lldb/trunk/source/Core/ValueObjectMemory.cpp @@ -136,10 +136,8 @@ uint64_t ValueObjectMemory::GetByteSize() { if (m_type_sp) - return m_type_sp->GetByteSize(); - if (llvm::Optional size = m_compiler_type.GetByteSize(nullptr)) - return *size; - return 0; + return m_type_sp->GetByteSize().getValueOr(0); + return m_compiler_type.GetByteSize(nullptr).getValueOr(0); } lldb::ValueType ValueObjectMemory::GetValueType() const { Index: lldb/trunk/source/Expression/Materializer.cpp =================================================================== --- lldb/trunk/source/Expression/Materializer.cpp +++ lldb/trunk/source/Expression/Materializer.cpp @@ -537,7 +537,8 @@ "size of variable %s (%" PRIu64 ") is larger than the ValueObject's size (%" PRIu64 ")", m_variable_sp->GetName().AsCString(), - m_variable_sp->GetType()->GetByteSize(), data.GetByteSize()); + m_variable_sp->GetType()->GetByteSize().getValueOr(0), + data.GetByteSize()); } return; } Index: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp =================================================================== --- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp +++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp @@ -264,7 +264,7 @@ const char *mangled_name_cstr = NULL; ConstString type_name_const_str; Type::ResolveState resolve_state = Type::eResolveStateUnresolved; - uint64_t byte_size = 0; + llvm::Optional byte_size; Declaration decl; Type::EncodingDataType encoding_data_type = Type::eEncodingIsUID; @@ -386,7 +386,7 @@ case DW_TAG_base_type: resolve_state = Type::eResolveStateFull; clang_type = m_ast.GetBuiltinTypeForDWARFEncodingAndBitSize( - type_name_cstr, encoding, byte_size * 8); + type_name_cstr, encoding, byte_size.getValueOr(0) * 8); break; case DW_TAG_pointer_type: @@ -535,7 +535,6 @@ case DW_TAG_class_type: { // Set a bit that lets us know that we are currently parsing this dwarf->GetDIEToType()[die.GetDIE()] = DIE_IS_BEING_PARSED; - bool byte_size_valid = false; LanguageType class_language = eLanguageTypeUnknown; bool is_complete_objc_class = false; @@ -569,7 +568,6 @@ case DW_AT_byte_size: byte_size = form_value.Unsigned(); - byte_size_valid = true; break; case DW_AT_accessibility: @@ -629,7 +627,7 @@ if (dwarf->GetUniqueDWARFASTTypeMap().Find( unique_typename, die, unique_decl, - byte_size_valid ? byte_size : -1, *unique_ast_entry_ap)) { + byte_size ? *byte_size : -1, *unique_ast_entry_ap)) { type_sp = unique_ast_entry_ap->m_type_sp; if (type_sp) { dwarf->GetDIEToType()[die.GetDIE()] = type_sp.get(); @@ -654,7 +652,7 @@ default_accessibility = eAccessPrivate; } - if (byte_size_valid && byte_size == 0 && type_name_cstr && + if (byte_size && *byte_size == 0 && type_name_cstr && !die.HasChildren() && sc.comp_unit->GetLanguage() == eLanguageTypeObjC) { // Work around an issue with clang at the moment where forward @@ -857,7 +855,7 @@ unique_ast_entry_ap->m_type_sp = type_sp; unique_ast_entry_ap->m_die = die; unique_ast_entry_ap->m_declaration = unique_decl; - unique_ast_entry_ap->m_byte_size = byte_size; + unique_ast_entry_ap->m_byte_size = byte_size.getValueOr(0); dwarf->GetUniqueDWARFASTTypeMap().Insert(unique_typename, *unique_ast_entry_ap); @@ -1084,10 +1082,10 @@ } if (!enumerator_clang_type) { - if (byte_size > 0) { + if (byte_size) { enumerator_clang_type = m_ast.GetBuiltinTypeForDWARFEncodingAndBitSize( - NULL, DW_ATE_signed, byte_size * 8); + NULL, DW_ATE_signed, *byte_size * 8); } else { enumerator_clang_type = m_ast.GetBasicType(eBasicTypeInt); } @@ -1115,7 +1113,7 @@ bool is_signed = false; enumerator_clang_type.IsIntegerType(is_signed); ParseChildEnumerators(cu_sc, clang_type, is_signed, - type_sp->GetByteSize(), die); + type_sp->GetByteSize().getValueOr(0), die); } ClangASTContext::CompleteTagDeclarationDefinition(clang_type); } else { @@ -1653,9 +1651,10 @@ } } } - type_sp.reset(new Type(die.GetID(), dwarf, type_name_const_str, 0, NULL, - LLDB_INVALID_UID, Type::eEncodingIsUID, &decl, - clang_type, Type::eResolveStateFull)); + type_sp.reset(new Type(die.GetID(), dwarf, type_name_const_str, + llvm::None, NULL, LLDB_INVALID_UID, + Type::eEncodingIsUID, &decl, clang_type, + Type::eResolveStateFull)); assert(type_sp.get()); } break; @@ -1739,7 +1738,7 @@ bit_stride = array_info->bit_stride; } if (byte_stride == 0 && bit_stride == 0) - byte_stride = element_type->GetByteSize(); + byte_stride = element_type->GetByteSize().getValueOr(0); CompilerType array_element_type = element_type->GetForwardCompilerType(); @@ -2312,7 +2311,7 @@ !layout_info.base_offsets.empty() || !layout_info.vbase_offsets.empty()) { if (type) - layout_info.bit_size = type->GetByteSize() * 8; + layout_info.bit_size = type->GetByteSize().getValueOr(0) * 8; if (layout_info.bit_size == 0) layout_info.bit_size = die.GetAttributeValueAsUnsigned(DW_AT_byte_size, 0) * 8; @@ -2396,8 +2395,8 @@ SymbolContext sc(die.GetLLDBCompileUnit()); bool is_signed = false; clang_type.IsIntegerType(is_signed); - ParseChildEnumerators(sc, clang_type, is_signed, type->GetByteSize(), - die); + ParseChildEnumerators(sc, clang_type, is_signed, + type->GetByteSize().getValueOr(0), die); } ClangASTContext::CompleteTagDeclarationDefinition(clang_type); } @@ -2721,7 +2720,7 @@ AccessType accessibility = eAccessNone; uint32_t member_byte_offset = (parent_die.Tag() == DW_TAG_union_type) ? 0 : UINT32_MAX; - size_t byte_size = 0; + llvm::Optional byte_size; int64_t bit_offset = 0; uint64_t data_bit_offset = UINT64_MAX; size_t bit_size = 0; @@ -2864,7 +2863,7 @@ // with a crash if we try to use this type in an expression when clang // becomes unhappy with its recycled debug info. - if (byte_size == 0 && bit_offset < 0) { + if (byte_size.getValueOr(0) == 0 && bit_offset < 0) { bit_size = 0; bit_offset = 0; } @@ -2926,12 +2925,12 @@ if (data_bit_offset != UINT64_MAX) { this_field_info.bit_offset = data_bit_offset; } else { - if (byte_size == 0) + if (!byte_size) byte_size = member_type->GetByteSize(); ObjectFile *objfile = die.GetDWARF()->GetObjectFile(); if (objfile->GetByteOrder() == eByteOrderLittle) { - this_field_info.bit_offset += byte_size * 8; + this_field_info.bit_offset += byte_size.getValueOr(0) * 8; this_field_info.bit_offset -= (bit_offset + bit_size); } else { this_field_info.bit_offset += bit_offset; Index: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp =================================================================== --- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -1699,7 +1699,8 @@ location_result.GetScalar().ULongLong(); lldb::addr_t byte_size = 1; if (var_sp->GetType()) - byte_size = var_sp->GetType()->GetByteSize(); + byte_size = + var_sp->GetType()->GetByteSize().getValueOr(0); m_global_aranges_ap->Append(GlobalVariableMap::Entry( file_addr, byte_size, var_sp.get())); } @@ -3534,9 +3535,10 @@ new SymbolFileType(*this, DIERef(type_die_form).GetUID(this))); if (const_value.Form() && type_sp && type_sp->GetType()) - location.CopyOpcodeData(const_value.Unsigned(), - type_sp->GetType()->GetByteSize(), - die.GetCU()->GetAddressByteSize()); + location.CopyOpcodeData( + const_value.Unsigned(), + type_sp->GetType()->GetByteSize().getValueOr(0), + die.GetCU()->GetAddressByteSize()); var_sp.reset(new Variable(die.GetID(), name, mangled, type_sp, scope, symbol_context_scope, scope_ranges, &decl, Index: lldb/trunk/source/Symbol/Type.cpp =================================================================== --- lldb/trunk/source/Symbol/Type.cpp +++ lldb/trunk/source/Symbol/Type.cpp @@ -107,7 +107,7 @@ } Type::Type(lldb::user_id_t uid, SymbolFile *symbol_file, - const ConstString &name, uint64_t byte_size, + const ConstString &name, llvm::Optional byte_size, SymbolContextScope *context, user_id_t encoding_uid, EncodingDataType encoding_uid_type, const Declaration &decl, const CompilerType &compiler_type, @@ -115,7 +115,14 @@ : std::enable_shared_from_this(), UserID(uid), m_name(name), m_symbol_file(symbol_file), m_context(context), m_encoding_type(nullptr), m_encoding_uid(encoding_uid), m_encoding_uid_type(encoding_uid_type), - m_byte_size(byte_size), m_decl(decl), m_compiler_type(compiler_type) { + m_decl(decl), m_compiler_type(compiler_type) { + if (byte_size) { + m_byte_size = *byte_size; + m_byte_size_has_value = true; + } else { + m_byte_size = 0; + m_byte_size_has_value = false; + } m_flags.compiler_type_resolve_state = (compiler_type ? compiler_type_resolve_state : eResolveStateUnresolved); m_flags.is_complete_objc_class = false; @@ -125,7 +132,8 @@ : std::enable_shared_from_this(), UserID(0), m_name(""), m_symbol_file(nullptr), m_context(nullptr), m_encoding_type(nullptr), m_encoding_uid(LLDB_INVALID_UID), m_encoding_uid_type(eEncodingInvalid), - m_byte_size(0), m_decl(), m_compiler_type() { + m_byte_size(0), m_byte_size_has_value(false), m_decl(), + m_compiler_type() { m_flags.compiler_type_resolve_state = eResolveStateUnresolved; m_flags.is_complete_objc_class = false; } @@ -135,7 +143,8 @@ m_symbol_file(rhs.m_symbol_file), m_context(rhs.m_context), m_encoding_type(rhs.m_encoding_type), m_encoding_uid(rhs.m_encoding_uid), m_encoding_uid_type(rhs.m_encoding_uid_type), - m_byte_size(rhs.m_byte_size), m_decl(rhs.m_decl), + m_byte_size(rhs.m_byte_size), + m_byte_size_has_value(rhs.m_byte_size_has_value), m_decl(rhs.m_decl), m_compiler_type(rhs.m_compiler_type), m_flags(rhs.m_flags) {} const Type &Type::operator=(const Type &rhs) { @@ -213,7 +222,7 @@ if (m_name) *s << ", name = \"" << m_name << "\""; - if (m_byte_size != 0) + if (m_byte_size_has_value) s->Printf(", size = %" PRIu64, m_byte_size); if (show_context && m_context != nullptr) { @@ -292,7 +301,7 @@ GetForwardCompilerType().DumpValue( exe_ctx, s, format == lldb::eFormatDefault ? GetFormat() : format, data, - data_byte_offset, GetByteSize(), + data_byte_offset, GetByteSize().getValueOr(0), 0, // Bitfield bit size 0, // Bitfield bit offset show_types, show_summary, verbose, 0); @@ -305,36 +314,46 @@ return m_encoding_type; } -uint64_t Type::GetByteSize() { - if (m_byte_size == 0) { - switch (m_encoding_uid_type) { - case eEncodingInvalid: - case eEncodingIsSyntheticUID: - break; - case eEncodingIsUID: - case eEncodingIsConstUID: - case eEncodingIsRestrictUID: - case eEncodingIsVolatileUID: - case eEncodingIsTypedefUID: { - Type *encoding_type = GetEncodingType(); - if (encoding_type) - m_byte_size = encoding_type->GetByteSize(); - if (m_byte_size == 0) - if (llvm::Optional size = - GetLayoutCompilerType().GetByteSize(nullptr)) - m_byte_size = *size; - } break; +llvm::Optional Type::GetByteSize() { + if (m_byte_size_has_value) + return m_byte_size; + + switch (m_encoding_uid_type) { + case eEncodingInvalid: + case eEncodingIsSyntheticUID: + break; + case eEncodingIsUID: + case eEncodingIsConstUID: + case eEncodingIsRestrictUID: + case eEncodingIsVolatileUID: + case eEncodingIsTypedefUID: { + Type *encoding_type = GetEncodingType(); + if (encoding_type) + if (llvm::Optional size = encoding_type->GetByteSize()) { + m_byte_size = *size; + m_byte_size_has_value = true; + return m_byte_size; + } + + if (llvm::Optional size = + GetLayoutCompilerType().GetByteSize(nullptr)) { + m_byte_size = *size; + m_byte_size_has_value = true; + return m_byte_size; + } + } break; // If we are a pointer or reference, then this is just a pointer size; case eEncodingIsPointerUID: case eEncodingIsLValueReferenceUID: case eEncodingIsRValueReferenceUID: { - if (ArchSpec arch = m_symbol_file->GetObjectFile()->GetArchitecture()) + if (ArchSpec arch = m_symbol_file->GetObjectFile()->GetArchitecture()) { m_byte_size = arch.GetAddressByteSize(); + m_byte_size_has_value = true; + } } break; - } } - return m_byte_size; + return {}; } uint32_t Type::GetNumChildren(bool omit_empty_base_classes) { @@ -388,7 +407,7 @@ return false; } - const uint64_t byte_size = GetByteSize(); + const uint64_t byte_size = GetByteSize().getValueOr(0); if (data.GetByteSize() < byte_size) { lldb::DataBufferSP data_sp(new DataBufferHeap(byte_size, '\0')); data.SetData(data_sp);