From 2a56e97f741bf8fefa68692304a29c64f37c65b7 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Mon, 28 Jan 2019 21:44:35 +0000 Subject: Revert "Make Type::GetByteSize optional (NFC)" This reverts commit r352394 because it broke three windows-specific tests. llvm-svn: 352434 --- lldb/source/Core/ValueObjectMemory.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lldb/source/Core/ValueObjectMemory.cpp') diff --git a/lldb/source/Core/ValueObjectMemory.cpp b/lldb/source/Core/ValueObjectMemory.cpp index 42d1263b390..68e58ab1305 100644 --- a/lldb/source/Core/ValueObjectMemory.cpp +++ b/lldb/source/Core/ValueObjectMemory.cpp @@ -136,8 +136,10 @@ size_t ValueObjectMemory::CalculateNumChildren(uint32_t max) { uint64_t ValueObjectMemory::GetByteSize() { if (m_type_sp) - return m_type_sp->GetByteSize().getValueOr(0); - return m_compiler_type.GetByteSize(nullptr).getValueOr(0); + return m_type_sp->GetByteSize(); + if (llvm::Optional size = m_compiler_type.GetByteSize(nullptr)) + return *size; + return 0; } lldb::ValueType ValueObjectMemory::GetValueType() const { -- cgit v1.2.3