Skip to content

Commit 6947b13

Browse files
committed
Remove caching of demangled name in StackFrameRecognizer
They are already cached in `Mangled`
1 parent e90463e commit 6947b13

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

lldb/include/lldb/Target/StackFrameRecognizer.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ class StackFrameRecognizerManager {
150150

151151
std::deque<RegisteredEntry> m_recognizers;
152152
uint16_t m_generation = 0;
153-
std::unordered_set<Mangled::NamePreference> m_used_manglings;
154153
};
155154

156155
/// \class ValueObjectRecognizerSynthesizedValue

lldb/source/Target/StackFrameRecognizer.cpp

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ void StackFrameRecognizerManager::AddRecognizer(
6767
m_recognizers.push_front({(uint32_t)m_recognizers.size(), recognizer, false,
6868
module, RegularExpressionSP(), symbols,
6969
RegularExpressionSP(), first_instruction_only});
70-
m_used_manglings.insert(mangling_preference);
7170
BumpGeneration();
7271
}
7372

@@ -79,7 +78,6 @@ void StackFrameRecognizerManager::AddRecognizer(
7978
ConstString(), module, std::vector<ConstString>(),
8079
symbol, first_instruction_only,
8180
mangling_preference});
82-
m_used_manglings.insert(mangling_preference);
8381
BumpGeneration();
8482
}
8583

@@ -124,30 +122,12 @@ bool StackFrameRecognizerManager::RemoveRecognizerWithID(
124122
void StackFrameRecognizerManager::RemoveAllRecognizers() {
125123
BumpGeneration();
126124
m_recognizers.clear();
127-
m_used_manglings.clear();
128125
}
129126

130127
StackFrameRecognizerSP
131128
StackFrameRecognizerManager::GetRecognizerForFrame(StackFrameSP frame) {
132129
const SymbolContext &symctx = frame->GetSymbolContext(
133130
eSymbolContextModule | eSymbolContextFunction | eSymbolContextSymbol);
134-
ConstString function_name_mangled;
135-
ConstString function_name_demangled;
136-
ConstString function_name_noargs;
137-
for (Mangled::NamePreference m : m_used_manglings) {
138-
switch (m) {
139-
case Mangled::ePreferMangled:
140-
function_name_mangled = symctx.GetFunctionName(m);
141-
break;
142-
case Mangled::ePreferDemangled:
143-
function_name_demangled = symctx.GetFunctionName(m);
144-
break;
145-
case Mangled::ePreferDemangledWithoutArguments:
146-
function_name_noargs = symctx.GetFunctionName(m);
147-
break;
148-
}
149-
}
150-
151131
ModuleSP module_sp = symctx.module_sp;
152132
if (!module_sp)
153133
return StackFrameRecognizerSP();
@@ -170,11 +150,11 @@ StackFrameRecognizerManager::GetRecognizerForFrame(StackFrameSP frame) {
170150
ConstString function_name = [&]() {
171151
switch (entry.mangling_preference) {
172152
case Mangled::ePreferMangled:
173-
return function_name_mangled;
153+
return symctx.GetFunctionName(entry.mangling_preference);
174154
case Mangled::ePreferDemangled:
175-
return function_name_demangled;
155+
return symctx.GetFunctionName(entry.mangling_preference);
176156
case Mangled::ePreferDemangledWithoutArguments:
177-
return function_name_noargs;
157+
return symctx.GetFunctionName(entry.mangling_preference);
178158
}
179159
}();
180160

0 commit comments

Comments
 (0)