Index: lldb/include/lldb/Symbol/CompilerType.h =================================================================== --- lldb/include/lldb/Symbol/CompilerType.h +++ lldb/include/lldb/Symbol/CompilerType.h @@ -177,7 +177,7 @@ /// Creating related types. /// \{ - CompilerType GetArrayElementType(uint64_t *stride = nullptr) const; + CompilerType GetArrayElementType() const; CompilerType GetArrayType(uint64_t size) const; Index: lldb/include/lldb/Symbol/TypeSystem.h =================================================================== --- lldb/include/lldb/Symbol/TypeSystem.h +++ lldb/include/lldb/Symbol/TypeSystem.h @@ -217,8 +217,8 @@ // Creating related types - virtual CompilerType GetArrayElementType(lldb::opaque_compiler_type_t type, - uint64_t *stride) = 0; + virtual CompilerType + GetArrayElementType(lldb::opaque_compiler_type_t type) = 0; virtual CompilerType GetArrayType(lldb::opaque_compiler_type_t type, uint64_t size); Index: lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h =================================================================== --- lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h +++ lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h @@ -688,8 +688,7 @@ const CompilerDeclContext &compiler_decl_ctx, uint32_t opaque_payload); - CompilerType GetArrayElementType(lldb::opaque_compiler_type_t type, - uint64_t *stride) override; + CompilerType GetArrayElementType(lldb::opaque_compiler_type_t type) override; CompilerType GetArrayType(lldb::opaque_compiler_type_t type, uint64_t size) override; Index: lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp =================================================================== --- lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp +++ lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp @@ -4088,8 +4088,7 @@ // Creating related types CompilerType -TypeSystemClang::GetArrayElementType(lldb::opaque_compiler_type_t type, - uint64_t *stride) { +TypeSystemClang::GetArrayElementType(lldb::opaque_compiler_type_t type) { if (type) { clang::QualType qual_type(GetQualType(type)); @@ -4099,14 +4098,7 @@ if (!array_eletype) return CompilerType(); - CompilerType element_type = GetType(clang::QualType(array_eletype, 0)); - - // TODO: the real stride will be >= this value.. find the real one! - if (stride) - if (Optional size = element_type.GetByteSize(nullptr)) - *stride = *size; - - return element_type; + return GetType(clang::QualType(array_eletype, 0)); } return CompilerType(); } Index: lldb/source/Symbol/CompilerType.cpp =================================================================== --- lldb/source/Symbol/CompilerType.cpp +++ lldb/source/Symbol/CompilerType.cpp @@ -317,9 +317,9 @@ // Creating related types -CompilerType CompilerType::GetArrayElementType(uint64_t *stride) const { +CompilerType CompilerType::GetArrayElementType() const { if (IsValid()) { - return m_type_system->GetArrayElementType(m_type, stride); + return m_type_system->GetArrayElementType(m_type); } return CompilerType(); }