https://github.com/Nerixyz updated https://github.com/llvm/llvm-project/pull/153386
>From 8dc9c3bbe20df1f55ebc36b8e2530330947c27e9 Mon Sep 17 00:00:00 2001 From: Nerixyz <nerix...@outlook.de> Date: Wed, 13 Aug 2025 12:38:28 +0200 Subject: [PATCH 1/2] [LLDB][Value] Require type size when reading a scalar --- lldb/source/Core/Value.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lldb/source/Core/Value.cpp b/lldb/source/Core/Value.cpp index 028f0587c5790..00750f51693d1 100644 --- a/lldb/source/Core/Value.cpp +++ b/lldb/source/Core/Value.cpp @@ -347,6 +347,9 @@ Status Value::GetValueAsData(ExecutionContext *exe_ctx, DataExtractor &data, else data.SetAddressByteSize(sizeof(void *)); + if (!type_size) + return Status::FromErrorString("type does not have a size"); + uint32_t result_byte_size = *type_size; if (m_value.GetData(data, result_byte_size)) return error; // Success; >From 96b896beefda05e58341732ea9ea9ba208cdb023 Mon Sep 17 00:00:00 2001 From: Nerixyz <nerix...@outlook.de> Date: Sat, 16 Aug 2025 17:45:58 +0200 Subject: [PATCH 2/2] add a unittest --- lldb/unittests/Core/CMakeLists.txt | 1 + lldb/unittests/Core/Value.cpp | 39 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 lldb/unittests/Core/Value.cpp diff --git a/lldb/unittests/Core/CMakeLists.txt b/lldb/unittests/Core/CMakeLists.txt index a6820bdc7d7fa..6e609a63ad9b6 100644 --- a/lldb/unittests/Core/CMakeLists.txt +++ b/lldb/unittests/Core/CMakeLists.txt @@ -15,6 +15,7 @@ add_lldb_unittest(LLDBCoreTests SourceManagerTest.cpp TelemetryTest.cpp UniqueCStringMapTest.cpp + Value.cpp LINK_COMPONENTS Support diff --git a/lldb/unittests/Core/Value.cpp b/lldb/unittests/Core/Value.cpp new file mode 100644 index 0000000000000..d18a700c00ec0 --- /dev/null +++ b/lldb/unittests/Core/Value.cpp @@ -0,0 +1,39 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "lldb/Core/Value.h" +#include "Plugins/Platform/MacOSX/PlatformMacOSX.h" +#include "Plugins/TypeSystem/Clang/TypeSystemClang.h" +#include "TestingSupport/SubsystemRAII.h" +#include "TestingSupport/Symbol/ClangTestUtils.h" + +#include "lldb/Utility/DataExtractor.h" + +#include "gtest/gtest.h" + +using namespace lldb_private; +using namespace lldb_private::clang_utils; + +TEST(ValueTest, GetValueAsData) { + SubsystemRAII<FileSystem, HostInfo, PlatformMacOSX> subsystems; + auto holder = std::make_unique<clang_utils::TypeSystemClangHolder>("test"); + auto *clang = holder->GetAST(); + + Value v(Scalar(42)); + DataExtractor extractor; + + // no compiler type + Status status = v.GetValueAsData(nullptr, extractor, nullptr); + ASSERT_TRUE(status.Fail()); + + // with compiler type + v.SetCompilerType(clang->GetBasicType(lldb::BasicType::eBasicTypeChar)); + + status = v.GetValueAsData(nullptr, extractor, nullptr); + ASSERT_TRUE(status.Success()); +} _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits