Skip to content

Commit 4fdd7cb

Browse files
committed
---
yaml --- r: 349100 b: refs/heads/master c: f5246c4 h: refs/heads/master
1 parent ed5b1e7 commit 4fdd7cb

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 65719d75a92a0279063be85de5d5da157506bd5e
2+
refs/heads/master: f5246c41fef9dfc73442a4fc6b9e7f17dc90b55b
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Sema/TypeCheckDecl.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1943,8 +1943,7 @@ static void checkInheritedDefaultValueRestrictions(ParamDecl *PD) {
19431943
}
19441944

19451945
/// Check the default arguments that occur within this pattern.
1946-
static void checkDefaultArguments(TypeChecker &tc, ParameterList *params,
1947-
ValueDecl *VD) {
1946+
static void checkDefaultArguments(TypeChecker &tc, ParameterList *params) {
19481947
for (auto *param : *params) {
19491948
checkInheritedDefaultValueRestrictions(param);
19501949
if (!param->getDefaultValue() ||
@@ -2598,7 +2597,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
25982597
(void) SD->getImplInfo();
25992598

26002599
TC.checkParameterAttributes(SD->getIndices());
2601-
checkDefaultArguments(TC, SD->getIndices(), SD);
2600+
checkDefaultArguments(TC, SD->getIndices());
26022601

26032602
if (SD->getDeclContext()->getSelfClassDecl()) {
26042603
checkDynamicSelfType(SD, SD->getValueInterfaceType());
@@ -3219,7 +3218,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
32193218
if (FD->getDeclContext()->getSelfClassDecl())
32203219
checkDynamicSelfType(FD, FD->getResultInterfaceType());
32213220

3222-
checkDefaultArguments(TC, FD->getParameters(), FD);
3221+
checkDefaultArguments(TC, FD->getParameters());
32233222

32243223
// Validate 'static'/'class' on functions in extensions.
32253224
auto StaticSpelling = FD->getStaticSpelling();
@@ -3277,7 +3276,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
32773276

32783277
if (auto *PL = EED->getParameterList()) {
32793278
TC.checkParameterAttributes(PL);
3280-
checkDefaultArguments(TC, PL, EED);
3279+
checkDefaultArguments(TC, PL);
32813280
}
32823281

32833282
// We don't yet support raw values on payload cases.
@@ -3537,7 +3536,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
35373536
TC.definedFunctions.push_back(CD);
35383537
}
35393538

3540-
checkDefaultArguments(TC, CD->getParameters(), CD);
3539+
checkDefaultArguments(TC, CD->getParameters());
35413540
}
35423541

35433542
void visitDestructorDecl(DestructorDecl *DD) {

0 commit comments

Comments
 (0)