https://github.com/kastiglione created https://github.com/llvm/llvm-project/pull/196453
None >From 89d47e785e6f984e6da007076b05bb98da3c5f0f Mon Sep 17 00:00:00 2001 From: Dave Lee <[email protected]> Date: Thu, 7 May 2026 17:45:47 -0700 Subject: [PATCH] [lldb] Rename GetInstanceVariableName to GetInstanceName (NFC) --- lldb/include/lldb/Symbol/SymbolContext.h | 6 +++--- lldb/include/lldb/Target/Language.h | 2 +- lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h | 2 +- lldb/source/Plugins/Language/ObjC/ObjCLanguage.h | 2 +- .../Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h | 2 +- lldb/source/Symbol/SymbolContext.cpp | 4 ++-- lldb/source/Target/StackFrame.cpp | 6 +++--- lldb/source/ValueObject/DILEval.cpp | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lldb/include/lldb/Symbol/SymbolContext.h b/lldb/include/lldb/Symbol/SymbolContext.h index 777317c5200a3..f7295cdaaebc3 100644 --- a/lldb/include/lldb/Symbol/SymbolContext.h +++ b/lldb/include/lldb/Symbol/SymbolContext.h @@ -269,13 +269,13 @@ class SymbolContext { /// represented by this symbol context object, nullptr otherwise. Block *GetFunctionBlock(); - /// Determines the name of the instance variable for the this decl context. + /// Determines the name of the instance for this decl context. /// /// For C++ the name is "this", for Objective-C the name is "self". /// /// \return - /// Returns a StringRef for the name of the instance variable. - llvm::StringRef GetInstanceVariableName(); + /// Returns a StringRef for the name of the instance. + llvm::StringRef GetInstanceName(); /// Sorts the types in TypeMap according to SymbolContext to TypeList /// diff --git a/lldb/include/lldb/Target/Language.h b/lldb/include/lldb/Target/Language.h index 4b8d4eaf262a0..9205b5e339977 100644 --- a/lldb/include/lldb/Target/Language.h +++ b/lldb/include/lldb/Target/Language.h @@ -468,7 +468,7 @@ class Language : public PluginInterface { return ConstString(); } - virtual llvm::StringRef GetInstanceVariableName() { return {}; } + virtual llvm::StringRef GetInstanceName() { return {}; } /// Given a symbol context list of matches which supposedly represent the /// same file and line number in a CU, erases those that should be ignored diff --git a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h index 53fae3fe71e3a..e9b0e80d8860b 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h +++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h @@ -229,7 +229,7 @@ class CPlusPlusLanguage : public Language { static llvm::Expected<ConstString> SubstituteStructorAliases_ItaniumMangle(llvm::StringRef mangled_name); - llvm::StringRef GetInstanceVariableName() override { return "this"; } + llvm::StringRef GetInstanceName() override { return "this"; } FormatEntity::Entry GetFunctionNameFormat() const override; diff --git a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.h b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.h index cee80ed0b7f40..7b8f56063fe8b 100644 --- a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.h +++ b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.h @@ -184,7 +184,7 @@ class ObjCLanguage : public Language { return false; } - llvm::StringRef GetInstanceVariableName() override { return "self"; } + llvm::StringRef GetInstanceName() override { return "self"; } virtual std::optional<bool> GetBooleanFromString(llvm::StringRef str) const override; diff --git a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h index ab45acd9c68db..9506fec391a9a 100644 --- a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h +++ b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h @@ -37,7 +37,7 @@ class ObjCPlusPlusLanguage : public Language { static lldb_private::Language *CreateInstance(lldb::LanguageType language); - llvm::StringRef GetInstanceVariableName() override { return "self"; } + llvm::StringRef GetInstanceName() override { return "self"; } virtual std::optional<bool> GetBooleanFromString(llvm::StringRef str) const override; diff --git a/lldb/source/Symbol/SymbolContext.cpp b/lldb/source/Symbol/SymbolContext.cpp index dde39fe8f5738..b36992e12c688 100644 --- a/lldb/source/Symbol/SymbolContext.cpp +++ b/lldb/source/Symbol/SymbolContext.cpp @@ -530,7 +530,7 @@ Block *SymbolContext::GetFunctionBlock() { return nullptr; } -llvm::StringRef SymbolContext::GetInstanceVariableName() { +llvm::StringRef SymbolContext::GetInstanceName() { LanguageType lang_type = eLanguageTypeUnknown; if (Block *function_block = GetFunctionBlock()) @@ -541,7 +541,7 @@ llvm::StringRef SymbolContext::GetInstanceVariableName() { lang_type = GetLanguage(); if (auto *lang = Language::FindPlugin(lang_type)) - return lang->GetInstanceVariableName(); + return lang->GetInstanceName(); return {}; } diff --git a/lldb/source/Target/StackFrame.cpp b/lldb/source/Target/StackFrame.cpp index c5939011ea91c..ff21a5c8fe7d1 100644 --- a/lldb/source/Target/StackFrame.cpp +++ b/lldb/source/Target/StackFrame.cpp @@ -637,9 +637,9 @@ ValueObjectSP StackFrame::LegacyGetValueForVariableExpressionPath( // Check for direct ivars access which helps us with implicit access to // ivars using "this" or "self". GetSymbolContext(eSymbolContextFunction | eSymbolContextBlock); - llvm::StringRef instance_var_name = m_sc.GetInstanceVariableName(); - if (!instance_var_name.empty()) { - var_sp = variable_list->FindVariable(ConstString(instance_var_name)); + llvm::StringRef instance_name = m_sc.GetInstanceName(); + if (!instance_name.empty()) { + var_sp = variable_list->FindVariable(ConstString(instance_name)); if (var_sp) { separator_idx = 0; if (Type *var_type = var_sp->GetType()) diff --git a/lldb/source/ValueObject/DILEval.cpp b/lldb/source/ValueObject/DILEval.cpp index 38db893c923b8..54ccfe76330a2 100644 --- a/lldb/source/ValueObject/DILEval.cpp +++ b/lldb/source/ValueObject/DILEval.cpp @@ -358,8 +358,8 @@ lldb::ValueObjectSP LookupIdentifier(llvm::StringRef name_ref, // Try looking for an instance variable (class member). SymbolContext sc = stack_frame->GetSymbolContext( lldb::eSymbolContextFunction | lldb::eSymbolContextBlock); - llvm::StringRef ivar_name = sc.GetInstanceVariableName(); - value_sp = stack_frame->FindVariable(ConstString(ivar_name)); + llvm::StringRef instance_name = sc.GetInstanceName(); + value_sp = stack_frame->FindVariable(ConstString(instance_name)); if (value_sp) value_sp = value_sp->GetChildMemberWithName(name_ref); _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
