https://github.com/kastiglione updated https://github.com/llvm/llvm-project/pull/201476
>From 5e2d7836d5a6249babae8e961bbb20c2773f085c Mon Sep 17 00:00:00 2001 From: Dave Lee <[email protected]> Date: Mon, 1 Jun 2026 22:25:01 -0700 Subject: [PATCH 1/4] [lldb] Remove 3 unused SymbolType values (NFC) --- lldb/include/lldb/lldb-enumerations.h | 3 --- .../ExpressionParser/Clang/ClangExpressionDeclMap.cpp | 3 --- lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp | 6 ------ .../Process/gdb-remote/GDBRemoteCommunicationClient.cpp | 3 --- lldb/source/Symbol/ObjectFile.cpp | 6 ------ lldb/source/Symbol/Symbol.cpp | 6 ------ lldb/source/Symbol/SymbolContext.cpp | 3 --- 7 files changed, 30 deletions(-) diff --git a/lldb/include/lldb/lldb-enumerations.h b/lldb/include/lldb/lldb-enumerations.h index a40788fca89e5..30280beb764ba 100644 --- a/lldb/include/lldb/lldb-enumerations.h +++ b/lldb/include/lldb/lldb-enumerations.h @@ -712,13 +712,10 @@ enum SymbolType { eSymbolTypeHeaderFile, eSymbolTypeObjectFile, eSymbolTypeCommonBlock, - eSymbolTypeBlock, eSymbolTypeLocal, - eSymbolTypeParam, eSymbolTypeVariable, eSymbolTypeVariableType, eSymbolTypeLineEntry, - eSymbolTypeLineHeader, eSymbolTypeScopeBegin, eSymbolTypeScopeEnd, eSymbolTypeAdditional, ///< When symbols take more than one entry, the extra diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp index 2278e30d562ef..5d04ca456d8eb 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp @@ -582,7 +582,6 @@ addr_t ClangExpressionDeclMap::GetSymbolAddress(Target &target, case eSymbolTypeRuntime: case eSymbolTypeVariable: case eSymbolTypeLocal: - case eSymbolTypeParam: case eSymbolTypeInvalid: case eSymbolTypeAbsolute: case eSymbolTypeException: @@ -590,10 +589,8 @@ addr_t ClangExpressionDeclMap::GetSymbolAddress(Target &target, case eSymbolTypeHeaderFile: case eSymbolTypeObjectFile: case eSymbolTypeCommonBlock: - case eSymbolTypeBlock: case eSymbolTypeVariableType: case eSymbolTypeLineEntry: - case eSymbolTypeLineHeader: case eSymbolTypeScopeBegin: case eSymbolTypeScopeEnd: case eSymbolTypeAdditional: diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 7dc829056a7da..5532becb59edf 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -1257,20 +1257,14 @@ AddressClass ObjectFileMachO::GetAddressClass(lldb::addr_t file_addr) { return AddressClass::eDebug; case eSymbolTypeCommonBlock: return AddressClass::eDebug; - case eSymbolTypeBlock: - return AddressClass::eDebug; case eSymbolTypeLocal: return AddressClass::eData; - case eSymbolTypeParam: - return AddressClass::eData; case eSymbolTypeVariable: return AddressClass::eData; case eSymbolTypeVariableType: return AddressClass::eDebug; case eSymbolTypeLineEntry: return AddressClass::eDebug; - case eSymbolTypeLineHeader: - return AddressClass::eDebug; case eSymbolTypeScopeBegin: return AddressClass::eDebug; case eSymbolTypeScopeEnd: diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp index 8df7936786b04..01b0470bcdfaf 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -4164,13 +4164,10 @@ void GDBRemoteCommunicationClient::ServeSymbolLookups( case eSymbolTypeHeaderFile: case eSymbolTypeObjectFile: case eSymbolTypeCommonBlock: - case eSymbolTypeBlock: case eSymbolTypeLocal: - case eSymbolTypeParam: case eSymbolTypeVariable: case eSymbolTypeVariableType: case eSymbolTypeLineEntry: - case eSymbolTypeLineHeader: case eSymbolTypeScopeBegin: case eSymbolTypeScopeEnd: case eSymbolTypeAdditional: diff --git a/lldb/source/Symbol/ObjectFile.cpp b/lldb/source/Symbol/ObjectFile.cpp index b1ec94063d38b..847a97d92fd2b 100644 --- a/lldb/source/Symbol/ObjectFile.cpp +++ b/lldb/source/Symbol/ObjectFile.cpp @@ -416,20 +416,14 @@ AddressClass ObjectFile::GetAddressClass(addr_t file_addr) { return AddressClass::eDebug; case eSymbolTypeCommonBlock: return AddressClass::eDebug; - case eSymbolTypeBlock: - return AddressClass::eDebug; case eSymbolTypeLocal: return AddressClass::eData; - case eSymbolTypeParam: - return AddressClass::eData; case eSymbolTypeVariable: return AddressClass::eData; case eSymbolTypeVariableType: return AddressClass::eDebug; case eSymbolTypeLineEntry: return AddressClass::eDebug; - case eSymbolTypeLineHeader: - return AddressClass::eDebug; case eSymbolTypeScopeBegin: return AddressClass::eDebug; case eSymbolTypeScopeEnd: diff --git a/lldb/source/Symbol/Symbol.cpp b/lldb/source/Symbol/Symbol.cpp index 308f4b086b0df..1ecc837847bca 100644 --- a/lldb/source/Symbol/Symbol.cpp +++ b/lldb/source/Symbol/Symbol.cpp @@ -755,13 +755,10 @@ const char *Symbol::GetTypeAsString(lldb::SymbolType symbol_type) { ENUM_TO_CSTRING(HeaderFile); ENUM_TO_CSTRING(ObjectFile); ENUM_TO_CSTRING(CommonBlock); - ENUM_TO_CSTRING(Block); ENUM_TO_CSTRING(Local); - ENUM_TO_CSTRING(Param); ENUM_TO_CSTRING(Variable); ENUM_TO_CSTRING(VariableType); ENUM_TO_CSTRING(LineEntry); - ENUM_TO_CSTRING(LineHeader); ENUM_TO_CSTRING(ScopeBegin); ENUM_TO_CSTRING(ScopeEnd); ENUM_TO_CSTRING(Additional); @@ -790,13 +787,10 @@ lldb::SymbolType Symbol::GetTypeFromString(const char *str) { .Case("headerfile", eSymbolTypeHeaderFile) .Case("objectfile", eSymbolTypeObjectFile) .Case("commonblock", eSymbolTypeCommonBlock) - .Case("block", eSymbolTypeBlock) .Case("local", eSymbolTypeLocal) - .Case("param", eSymbolTypeParam) .Case("variable", eSymbolTypeVariable) .Case("variableType", eSymbolTypeVariableType) .Case("lineentry", eSymbolTypeLineEntry) - .Case("lineheader", eSymbolTypeLineHeader) .Case("scopebegin", eSymbolTypeScopeBegin) .Case("scopeend", eSymbolTypeScopeEnd) .Case("additional,", eSymbolTypeAdditional) diff --git a/lldb/source/Symbol/SymbolContext.cpp b/lldb/source/Symbol/SymbolContext.cpp index 61620ee76cd92..f221a066931d1 100644 --- a/lldb/source/Symbol/SymbolContext.cpp +++ b/lldb/source/Symbol/SymbolContext.cpp @@ -813,7 +813,6 @@ const Symbol *SymbolContext::FindBestGlobalDataSymbol(ConstString name, case eSymbolTypeCode: // We already lookup functions elsewhere case eSymbolTypeVariable: case eSymbolTypeLocal: - case eSymbolTypeParam: case eSymbolTypeTrampoline: case eSymbolTypeInvalid: case eSymbolTypeException: @@ -821,10 +820,8 @@ const Symbol *SymbolContext::FindBestGlobalDataSymbol(ConstString name, case eSymbolTypeHeaderFile: case eSymbolTypeObjectFile: case eSymbolTypeCommonBlock: - case eSymbolTypeBlock: case eSymbolTypeVariableType: case eSymbolTypeLineEntry: - case eSymbolTypeLineHeader: case eSymbolTypeScopeBegin: case eSymbolTypeScopeEnd: case eSymbolTypeAdditional: >From 0fabb41ea10c4f3ceef9d898861e1db3b9c66062 Mon Sep 17 00:00:00 2001 From: Dave Lee <[email protected]> Date: Wed, 3 Jun 2026 16:58:46 -0700 Subject: [PATCH 2/4] Maintain SymbolType enumerator values --- lldb/include/lldb/lldb-enumerations.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lldb/include/lldb/lldb-enumerations.h b/lldb/include/lldb/lldb-enumerations.h index 30280beb764ba..85cfb2c462dc1 100644 --- a/lldb/include/lldb/lldb-enumerations.h +++ b/lldb/include/lldb/lldb-enumerations.h @@ -712,11 +712,14 @@ enum SymbolType { eSymbolTypeHeaderFile, eSymbolTypeObjectFile, eSymbolTypeCommonBlock, - eSymbolTypeLocal, - eSymbolTypeVariable, + // Free slot. + eSymbolTypeLocal = 13, + // Free slot. + eSymbolTypeVariable = 15, eSymbolTypeVariableType, eSymbolTypeLineEntry, - eSymbolTypeScopeBegin, + // Free slot. + eSymbolTypeScopeBegin = 19, eSymbolTypeScopeEnd, eSymbolTypeAdditional, ///< When symbols take more than one entry, the extra ///< entries get this type >From 85ea807e3a4c317a67521955b9a2d8efe4fa8037 Mon Sep 17 00:00:00 2001 From: Dave Lee <[email protected]> Date: Wed, 3 Jun 2026 17:32:18 -0700 Subject: [PATCH 3/4] Rework preserved values --- lldb/include/lldb/lldb-enumerations.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lldb/include/lldb/lldb-enumerations.h b/lldb/include/lldb/lldb-enumerations.h index 85cfb2c462dc1..c2b8d847b4df4 100644 --- a/lldb/include/lldb/lldb-enumerations.h +++ b/lldb/include/lldb/lldb-enumerations.h @@ -712,14 +712,14 @@ enum SymbolType { eSymbolTypeHeaderFile, eSymbolTypeObjectFile, eSymbolTypeCommonBlock, - // Free slot. - eSymbolTypeLocal = 13, - // Free slot. - eSymbolTypeVariable = 15, + eSymbolTypeUnused1, // Free slot, previously eSymbolTypeBlock. + eSymbolTypeLocal, + eSymbolTypeUnused2, // Free slot, previously eSymbolTypeParam. + eSymbolTypeVariable, eSymbolTypeVariableType, eSymbolTypeLineEntry, - // Free slot. - eSymbolTypeScopeBegin = 19, + eSymbolTypeUnused3, // Free slot, previously eSymbolTypeLineHeader. + eSymbolTypeScopeBegin, eSymbolTypeScopeEnd, eSymbolTypeAdditional, ///< When symbols take more than one entry, the extra ///< entries get this type >From 1b9b2167296b3c894890455a89a2ae1ec62be0aa Mon Sep 17 00:00:00 2001 From: Dave Lee <[email protected]> Date: Wed, 3 Jun 2026 17:53:12 -0700 Subject: [PATCH 4/4] Remove other references --- lldb/docs/python_api_enums.rst | 3 --- lldb/utils/lui/lldbutil.py | 6 ------ 2 files changed, 9 deletions(-) diff --git a/lldb/docs/python_api_enums.rst b/lldb/docs/python_api_enums.rst index a43a47b8d6985..2b4fe791cb75b 100644 --- a/lldb/docs/python_api_enums.rst +++ b/lldb/docs/python_api_enums.rst @@ -897,13 +897,10 @@ SymbolType .. py:data:: eSymbolTypeHeaderFile .. py:data:: eSymbolTypeObjectFile .. py:data:: eSymbolTypeCommonBlock -.. py:data:: eSymbolTypeBlock .. py:data:: eSymbolTypeLocal -.. py:data:: eSymbolTypeParam .. py:data:: eSymbolTypeVariable .. py:data:: eSymbolTypeVariableType .. py:data:: eSymbolTypeLineEntry -.. py:data:: eSymbolTypeLineHeader .. py:data:: eSymbolTypeScopeBegin .. py:data:: eSymbolTypeScopeEnd .. py:data:: eSymbolTypeAdditional diff --git a/lldb/utils/lui/lldbutil.py b/lldb/utils/lui/lldbutil.py index 589acaeea3206..d515839db67fa 100644 --- a/lldb/utils/lui/lldbutil.py +++ b/lldb/utils/lui/lldbutil.py @@ -229,20 +229,14 @@ def symbol_type_to_str(enum): return "objectfile" elif enum == lldb.eSymbolTypeCommonBlock: return "commonblock" - elif enum == lldb.eSymbolTypeBlock: - return "block" elif enum == lldb.eSymbolTypeLocal: return "local" - elif enum == lldb.eSymbolTypeParam: - return "param" elif enum == lldb.eSymbolTypeVariable: return "variable" elif enum == lldb.eSymbolTypeVariableType: return "variabletype" elif enum == lldb.eSymbolTypeLineEntry: return "lineentry" - elif enum == lldb.eSymbolTypeLineHeader: - return "lineheader" elif enum == lldb.eSymbolTypeScopeBegin: return "scopebegin" elif enum == lldb.eSymbolTypeScopeEnd: _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
