@@ -1906,8 +1906,7 @@ getParamIndex(const ParameterList *paramList, const ParamDecl *decl) {
1906
1906
return None;
1907
1907
}
1908
1908
1909
- static void
1910
- checkInheritedDefaultValueRestrictions (TypeChecker &TC, ParamDecl *PD) {
1909
+ static void checkInheritedDefaultValueRestrictions (ParamDecl *PD) {
1911
1910
if (PD->getDefaultArgumentKind () != DefaultArgumentKind::Inherited)
1912
1911
return ;
1913
1912
@@ -1919,18 +1918,17 @@ checkInheritedDefaultValueRestrictions(TypeChecker &TC, ParamDecl *PD) {
1919
1918
// The containing decl should be a designated initializer.
1920
1919
auto ctor = dyn_cast<ConstructorDecl>(DC);
1921
1920
if (!ctor || ctor->isConvenienceInit ()) {
1922
- TC.diagnose (
1923
- PD, diag::inherited_default_value_not_in_designated_constructor);
1921
+ PD->diagnose (diag::inherited_default_value_not_in_designated_constructor);
1924
1922
return ;
1925
1923
}
1926
1924
1927
1925
// The decl it overrides should also be a designated initializer.
1928
1926
auto overridden = ctor->getOverriddenDecl ();
1929
1927
if (!overridden || overridden->isConvenienceInit ()) {
1930
- TC. diagnose (
1931
- PD, diag::inherited_default_value_used_in_non_overriding_constructor);
1928
+ PD-> diagnose (
1929
+ diag::inherited_default_value_used_in_non_overriding_constructor);
1932
1930
if (overridden)
1933
- TC. diagnose (overridden, diag::overridden_here);
1931
+ overridden-> diagnose (diag::overridden_here);
1934
1932
return ;
1935
1933
}
1936
1934
@@ -1939,16 +1937,16 @@ checkInheritedDefaultValueRestrictions(TypeChecker &TC, ParamDecl *PD) {
1939
1937
assert (idx && " containing decl does not contain param?" );
1940
1938
ParamDecl *equivalentParam = overridden->getParameters ()->get (*idx);
1941
1939
if (equivalentParam->getDefaultArgumentKind () == DefaultArgumentKind::None) {
1942
- TC. diagnose (PD, diag::corresponding_param_not_defaulted);
1943
- TC. diagnose (equivalentParam, diag::inherited_default_param_here);
1940
+ PD-> diagnose (diag::corresponding_param_not_defaulted);
1941
+ equivalentParam-> diagnose (diag::inherited_default_param_here);
1944
1942
}
1945
1943
}
1946
1944
1947
1945
// / Check the default arguments that occur within this pattern.
1948
1946
static void checkDefaultArguments (TypeChecker &tc, ParameterList *params,
1949
1947
ValueDecl *VD) {
1950
1948
for (auto *param : *params) {
1951
- checkInheritedDefaultValueRestrictions (tc, param);
1949
+ checkInheritedDefaultValueRestrictions (param);
1952
1950
if (!param->getDefaultValue () ||
1953
1951
!param->hasInterfaceType () ||
1954
1952
param->getInterfaceType ()->hasError ())
0 commit comments