https://github.com/firmiana402 updated https://github.com/llvm/llvm-project/pull/208435
>From 5f80116cf6c48cfb7423c175b901f00dc77ecdb1 Mon Sep 17 00:00:00 2001 From: firmiana402 <[email protected]> Date: Thu, 9 Jul 2026 19:20:48 +0800 Subject: [PATCH] [lldb] Reject non-base type DIEs for DW_OP_convert --- .../Plugins/SymbolFile/DWARF/DWARFUnit.cpp | 3 +++ .../Expression/DWARFExpressionTest.cpp | 22 ++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp index 4b02124e987e8..aea2267277656 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp @@ -724,6 +724,9 @@ DWARFUnit::GetDIEBitSizeAndSign(uint64_t relative_die_offset) const { DWARFDIE die = const_cast<DWARFUnit *>(this)->GetDIE(abs_die_offset); if (!die) return llvm::createStringError("cannot resolve DW_OP_convert type DIE"); + if (die.Tag() != DW_TAG_base_type) + return llvm::createStringError( + "DW_OP_convert type DIE is not a DW_TAG_base_type"); uint64_t encoding = die.GetAttributeValueAsUnsigned(DW_AT_encoding, DW_ATE_hi_user); uint64_t bit_size = die.GetAttributeValueAsUnsigned(DW_AT_byte_size, 0) * 8; diff --git a/lldb/unittests/Expression/DWARFExpressionTest.cpp b/lldb/unittests/Expression/DWARFExpressionTest.cpp index 75162ca0b5f3e..bb64425ca9426 100644 --- a/lldb/unittests/Expression/DWARFExpressionTest.cpp +++ b/lldb/unittests/Expression/DWARFExpressionTest.cpp @@ -445,6 +445,14 @@ TEST(DWARFExpression, DW_OP_convert) { Form: DW_FORM_data1 - Attribute: DW_AT_byte_size Form: DW_FORM_data1 + - Code: 0x00000003 + Tag: DW_TAG_enumeration_type + Children: DW_CHILDREN_no + Attributes: + - Attribute: DW_AT_encoding + Form: DW_FORM_data1 + - Attribute: DW_AT_byte_size + Form: DW_FORM_data1 debug_info: - Version: 4 AddrSize: 8 @@ -493,15 +501,21 @@ TEST(DWARFExpression, DW_OP_convert) { Values: - Value: 0x000000000000000b # DW_ATE_numeric_string - Value: 0x0000000000000001 + # 0x00000020: + - AbbrCode: 0x00000003 + Values: + - Value: 0x0000000000000007 # DW_ATE_unsigned + - Value: 0x0000000000000004 - AbbrCode: 0x00000000 )"; - // Compile unit relative offsets to each DW_TAG_base_type + // Compile unit relative offsets to type DIEs. uint8_t offs_uint32_t = 0x0000000e; uint8_t offs_uint64_t = 0x00000011; uint8_t offs_sint64_t = 0x00000014; uint8_t offs_uchar = 0x00000017; uint8_t offs_schar = 0x0000001a; + uint8_t offs_enum = 0x00000020; DWARFExpressionTester t(yamldata, /*cu_index=*/1); ASSERT_TRUE((bool)t.GetDwarfUnit()); @@ -575,6 +589,12 @@ TEST(DWARFExpression, DW_OP_convert) { t.Eval({DW_OP_const1s, 'X', DW_OP_convert, 0x1d}).takeError(), llvm::Failed()); + // Not a DW_TAG_base_type. + EXPECT_THAT_ERROR( + t.Eval({DW_OP_const1s, 'X', DW_OP_convert, offs_enum}).takeError(), + llvm::FailedWithMessage( + "DW_OP_convert type DIE is not a DW_TAG_base_type")); + // A non-zero DIE offset with no DWARF unit. EXPECT_THAT_ERROR( Evaluate({DW_OP_const1s, 'X', DW_OP_convert, 0x01}, nullptr, nullptr) _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
