Skip to content

Commit f618935

Browse files
committed
[Omit needless words] Don't ask for the StringRef of an empty identifier.
1 parent ba40b3f commit f618935

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

lib/Sema/MiscDiagnostics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2068,7 +2068,7 @@ static Optional<DeclName> omitNeedlessWords(AbstractFunctionDecl *afd) {
20682068
// Figure out the first parameter name.
20692069
StringRef firstParamName;
20702070
auto params = afd->getParameterList(afd->getImplicitSelfDecl() ? 1 : 0);
2071-
if (params->size() != 0)
2071+
if (params->size() != 0 && !params->get(0)->getName().empty())
20722072
firstParamName = params->get(0)->getName().str();
20732073

20742074
// Find the set of property names.

test/Sema/omit_needless_words.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ extension String {
3030
class NSArray {
3131
func arrayByAddingObject(x: AnyObject) -> NSArray { return NSArray() } // expected-warning{{'arrayByAddingObject' could be named 'adding' [-Womit-needless-words]}}{{8-27=adding}}
3232
}
33+
34+
func emptyFirstParamName(_: Int) { }

0 commit comments

Comments
 (0)