Skip to content

Commit 7196c76

Browse files
committed
[ClangImporter] Use the current ImportNameVersion for param names.
This shouldn't have any effect since we've never customized how parameter names are imported (body names, not argument labels), but it removes special cases.
1 parent c9124d9 commit 7196c76

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/ClangImporter/ImportType.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,7 +1626,7 @@ ParameterList *ClangImporter::Implementation::importFunctionParameterList(
16261626
}
16271627

16281628
// Figure out the name for this parameter.
1629-
Identifier bodyName = importFullName(param, ImportNameVersion::Swift3)
1629+
Identifier bodyName = importFullName(param, CurrentVersion)
16301630
.getDeclName()
16311631
.getBaseName();
16321632

@@ -2037,7 +2037,7 @@ Type ClangImporter::Implementation::importMethodType(
20372037
}
20382038

20392039
// Figure out the name for this parameter.
2040-
Identifier bodyName = importFullName(param, ImportNameVersion::Swift3)
2040+
Identifier bodyName = importFullName(param, CurrentVersion)
20412041
.getDeclName()
20422042
.getBaseName();
20432043

@@ -2194,7 +2194,7 @@ Type ClangImporter::Implementation::importAccessorMethodType(
21942194

21952195
} else {
21962196
const clang::ParmVarDecl *param = clangDecl->parameters().front();
2197-
ImportedName fullBodyName = importFullName(param,ImportNameVersion::Swift3);
2197+
ImportedName fullBodyName = importFullName(param, CurrentVersion);
21982198
Identifier bodyName = fullBodyName.getDeclName().getBaseName();
21992199
SourceLoc nameLoc = importSourceLoc(param->getLocation());
22002200
Identifier argLabel = functionName.getDeclName().getArgumentNames().front();

0 commit comments

Comments
 (0)