Skip to content

Commit d10bda6

Browse files
committed
[Demangler] Fix a declaration shadowing warning.
We were using the name SymbolicReferenceResolver for both an argument and a member variable. Rename the argument to fix. rdar://97560843
1 parent 6a889c8 commit d10bda6

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

lib/Demangling/Demangler.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -561,9 +561,8 @@ Demangler::DemangleInitRAII::~DemangleInitRAII() {
561561
}
562562

563563
NodePointer Demangler::demangleSymbol(StringRef MangledName,
564-
std::function<SymbolicReferenceResolver_t> SymbolicReferenceResolver) {
565-
DemangleInitRAII state(*this, MangledName,
566-
std::move(SymbolicReferenceResolver));
564+
std::function<SymbolicReferenceResolver_t> Resolver) {
565+
DemangleInitRAII state(*this, MangledName, std::move(Resolver));
567566

568567
#if SWIFT_SUPPORT_OLD_MANGLING
569568
// Demangle old-style class and protocol names, which are still used in the
@@ -610,9 +609,8 @@ NodePointer Demangler::demangleSymbol(StringRef MangledName,
610609
}
611610

612611
NodePointer Demangler::demangleType(StringRef MangledName,
613-
std::function<SymbolicReferenceResolver_t> SymbolicReferenceResolver) {
614-
DemangleInitRAII state(*this, MangledName,
615-
std::move(SymbolicReferenceResolver));
612+
std::function<SymbolicReferenceResolver_t> Resolver) {
613+
DemangleInitRAII state(*this, MangledName, std::move(Resolver));
616614

617615
parseAndPushNodes();
618616

0 commit comments

Comments
 (0)