Skip to content

Commit fc28cfe

Browse files
authored
Merge pull request #75680 from nico/unused-but-set
Demangling: Fix -Wunused-but-set-variable warnings
2 parents d433919 + 4d630fd commit fc28cfe

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

lib/Demangling/Demangler.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ NodePointer Demangler::demangleSymbolicReference(unsigned char rawKind) {
962962
}
963963

964964
NodePointer Demangler::demangleTypeAnnotation() {
965-
switch (char c2 = nextChar()) {
965+
switch (nextChar()) {
966966
case 'a':
967967
return createNode(Node::Kind::AsyncAnnotation);
968968
case 'A':
@@ -1019,7 +1019,7 @@ NodePointer Demangler::demangleOperator() {
10191019
case 'F': return demanglePlainFunction();
10201020
case 'G': return demangleBoundGenericType();
10211021
case 'H':
1022-
switch (char c2 = nextChar()) {
1022+
switch (nextChar()) {
10231023
case 'A': return demangleDependentProtocolConformanceAssociated();
10241024
case 'C': return demangleConcreteProtocolConformance();
10251025
case 'D': return demangleDependentProtocolConformanceRoot();
@@ -1200,7 +1200,7 @@ NodePointer Demangler::createSwiftType(Node::Kind typeKind, const char *name) {
12001200
}
12011201

12021202
NodePointer Demangler::demangleStandardSubstitution() {
1203-
switch (char c = nextChar()) {
1203+
switch (nextChar()) {
12041204
case 'o':
12051205
return createNode(Node::Kind::Module, MANGLING_MODULE_OBJC);
12061206
case 'C':
@@ -3112,7 +3112,7 @@ NodePointer Demangler::demangleDifferentiabilityWitness() {
31123112
result = addChild(result, node);
31133113
result->reverseChildren();
31143114
MangledDifferentiabilityKind kind;
3115-
switch (auto c = nextChar()) {
3115+
switch (nextChar()) {
31163116
case 'f': kind = MangledDifferentiabilityKind::Forward; break;
31173117
case 'r': kind = MangledDifferentiabilityKind::Reverse; break;
31183118
case 'd': kind = MangledDifferentiabilityKind::Normal; break;
@@ -3144,7 +3144,7 @@ NodePointer Demangler::demangleIndexSubset() {
31443144

31453145
NodePointer Demangler::demangleDifferentiableFunctionType() {
31463146
MangledDifferentiabilityKind kind;
3147-
switch (auto c = nextChar()) {
3147+
switch (nextChar()) {
31483148
case 'f': kind = MangledDifferentiabilityKind::Forward; break;
31493149
case 'r': kind = MangledDifferentiabilityKind::Reverse; break;
31503150
case 'd': kind = MangledDifferentiabilityKind::Normal; break;
@@ -3157,7 +3157,7 @@ NodePointer Demangler::demangleDifferentiableFunctionType() {
31573157

31583158
static std::optional<MangledLifetimeDependenceKind>
31593159
getMangledLifetimeDependenceKind(char nextChar) {
3160-
switch (auto c = nextChar) {
3160+
switch (nextChar) {
31613161
case 's':
31623162
return MangledLifetimeDependenceKind::Scope;
31633163
case 'i':
@@ -3660,7 +3660,7 @@ NodePointer Demangler::demangleWitness() {
36603660
case 'z': {
36613661
auto declList = createNode(Node::Kind::GlobalVariableOnceDeclList);
36623662
std::vector<NodePointer> vars;
3663-
while (auto sig = popNode(Node::Kind::FirstElementMarker)) {
3663+
while (popNode(Node::Kind::FirstElementMarker)) {
36643664
auto identifier = popNode(isDeclName);
36653665
if (!identifier)
36663666
return nullptr;
@@ -3711,7 +3711,7 @@ NodePointer Demangler::demangleSpecialType() {
37113711
case 'j':
37123712
return demangleSymbolicExtendedExistentialType();
37133713
case 'z':
3714-
switch (auto cchar = nextChar()) {
3714+
switch (nextChar()) {
37153715
case 'B':
37163716
return popFunctionType(Node::Kind::ObjCBlock, true);
37173717
case 'C':

lib/Demangling/Remangler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1979,7 +1979,7 @@ ManglingError Remangler::mangleImplFunctionType(Node *node, unsigned depth) {
19791979
Node *PatternSubs = nullptr;
19801980
Node *InvocationSubs = nullptr;
19811981
for (NodePointer Child : *node) {
1982-
switch (auto kind = Child->getKind()) {
1982+
switch (Child->getKind()) {
19831983
case Node::Kind::ImplParameter:
19841984
case Node::Kind::ImplResult:
19851985
case Node::Kind::ImplYield:

0 commit comments

Comments
 (0)