---
lib/Sema/SemaDecl.cpp | 55 ++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 5aae780..91ed93d 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -4307,8 +4307,6 @@ namespace {
struct ActOnFDArgs {
Scope *S;
Declarator &D;
- DeclContext *DC;
- TypeSourceInfo *TInfo;
MultiTemplateParamsArg TemplateParamLists;
bool AddToScope;
};
@@ -4324,29 +4322,31 @@ namespace {
/// Returns a NamedDecl iff typo correction was performed and substituting in
/// the new declaration name does not cause new errors.
static NamedDecl* DiagnoseInvalidRedeclaration(
- Sema &S, LookupResult &Previous, FunctionDecl *NewFD, bool isFriendDecl,
+ Sema &SemaRef, LookupResult &Previous, FunctionDecl *NewFD,
ActOnFDArgs &ExtraArgs) {
- assert(NewFD->getDeclContext() == ExtraArgs.DC && "NewFD has different DeclContext!");
NamedDecl *Result = NULL;
DeclarationName Name = NewFD->getDeclName();
DeclContext *NewDC = NewFD->getDeclContext();
- LookupResult Prev(S, Name, NewFD->getLocation(),
+ LookupResult Prev(SemaRef, Name, NewFD->getLocation(),
Sema::LookupOrdinaryName, Sema::ForRedeclaration);
llvm::SmallVector<unsigned, 1> MismatchedParams;
llvm::SmallVector<std::pair<FunctionDecl*, unsigned>, 1> NearMatches;
TypoCorrection Correction;
+ bool isFriendDecl = (SemaRef.getLangOptions().CPlusPlus &&
+ ExtraArgs.D.getDeclSpec().isFriendSpecified());
unsigned DiagMsg = isFriendDecl ? diag::err_no_matching_local_friend
: diag::err_member_def_does_not_match;
NewFD->setInvalidDecl();
- S.LookupQualifiedName(Prev, NewDC);
+ SemaRef.LookupQualifiedName(Prev, NewDC);
assert(!Prev.isAmbiguous() &&
"Cannot have an ambiguity in previous-declaration lookup");
if (!Prev.empty()) {
for (LookupResult::iterator Func = Prev.begin(), FuncEnd = Prev.end();
Func != FuncEnd; ++Func) {
FunctionDecl *FD = dyn_cast<FunctionDecl>(*Func);
- if (FD && hasSimilarParameters(S.Context, FD, NewFD, MismatchedParams)) {
+ if (FD &&
+ hasSimilarParameters(SemaRef.Context, FD, NewFD, MismatchedParams)) {
// Add 1 to the index so that 0 can mean the mismatch didn't
// involve a parameter
unsigned ParamNum =
@@ -4355,11 +4355,11 @@ static NamedDecl* DiagnoseInvalidRedeclaration(
}
}
// If the qualified name lookup yielded nothing, try typo correction
- } else if ((Correction = S.CorrectTypo(Prev.getLookupNameInfo(),
+ } else if ((Correction = SemaRef.CorrectTypo(Prev.getLookupNameInfo(),
Prev.getLookupKind(), 0, 0, NewDC)) &&
Correction.getCorrection() != Name) {
// Trap errors.
- Sema::SFINAETrap Trap(S);
+ Sema::SFINAETrap Trap(SemaRef);
// Set up everything for the call to ActOnFunctionDeclarator
ExtraArgs.D.SetIdentifier(Correction.getCorrectionAsIdentifierInfo(),
@@ -4370,7 +4370,8 @@ static NamedDecl* DiagnoseInvalidRedeclaration(
CDeclEnd = Correction.end();
CDecl != CDeclEnd; ++CDecl) {
FunctionDecl *FD = dyn_cast<FunctionDecl>(*CDecl);
- if (FD && hasSimilarParameters(S.Context, FD, NewFD, MismatchedParams)) {
+ if (FD && hasSimilarParameters(SemaRef.Context, FD, NewFD,
+ MismatchedParams)) {
Previous.addDecl(FD);
}
}
@@ -4378,10 +4379,12 @@ static NamedDecl* DiagnoseInvalidRedeclaration(
// TODO: Refactor ActOnFunctionDeclarator so that we can call only the
// pieces need to verify the typo-corrected C++ declaraction and hopefully
// eliminate the need for the parameter pack ExtraArgs.
- Result = S.ActOnFunctionDeclarator(ExtraArgs.S, ExtraArgs.D, ExtraArgs.DC,
- ExtraArgs.TInfo, Previous,
- ExtraArgs.TemplateParamLists,
- ExtraArgs.AddToScope);
+ Result = SemaRef.ActOnFunctionDeclarator(ExtraArgs.S, ExtraArgs.D,
+ NewFD->getDeclContext(),
+ NewFD->getTypeSourceInfo(),
+ Previous,
+ ExtraArgs.TemplateParamLists,
+ ExtraArgs.AddToScope);
if (Trap.hasErrorOccurred()) {
// Pretend the typo correction never occurred
ExtraArgs.D.SetIdentifier(Name.getAsIdentifierInfo(),
@@ -4408,12 +4411,14 @@ static NamedDecl* DiagnoseInvalidRedeclaration(
}
if (Correction)
- S.Diag(NewFD->getLocation(), DiagMsg)
- << Name << NewDC << Correction.getQuoted(S.getLangOptions())
+ SemaRef.Diag(NewFD->getLocation(), DiagMsg)
+ << Name << NewDC << Correction.getQuoted(SemaRef.getLangOptions())
<< FixItHint::CreateReplacement(
- NewFD->getLocation(), Correction.getAsString(S.getLangOptions()));
+ NewFD->getLocation(),
+ Correction.getAsString(SemaRef.getLangOptions()));
else
- S.Diag(NewFD->getLocation(), DiagMsg) << Name << NewDC << NewFD->getLocation();
+ SemaRef.Diag(NewFD->getLocation(), DiagMsg)
+ << Name << NewDC << NewFD->getLocation();
for (llvm::SmallVector<std::pair<FunctionDecl*, unsigned>, 1>::iterator
NearMatch = NearMatches.begin(), NearMatchEnd = NearMatches.end();
@@ -4422,14 +4427,14 @@ static NamedDecl* DiagnoseInvalidRedeclaration(
if (unsigned Idx = NearMatch->second) {
ParmVarDecl *FDParam = FD->getParamDecl(Idx-1);
- S.Diag(FDParam->getTypeSpecStartLoc(),
+ SemaRef.Diag(FDParam->getTypeSpecStartLoc(),
diag::note_member_def_close_param_match)
<< Idx << FDParam->getType() << NewFD->getParamDecl(Idx-1)->getType();
} else if (Correction) {
- S.Diag(FD->getLocation(), diag::note_previous_decl)
- << Correction.getQuoted(S.getLangOptions());
+ SemaRef.Diag(FD->getLocation(), diag::note_previous_decl)
+ << Correction.getQuoted(SemaRef.getLangOptions());
} else
- S.Diag(FD->getLocation(), diag::note_member_def_close_match);
+ SemaRef.Diag(FD->getLocation(), diag::note_member_def_close_match);
}
return Result;
}
@@ -5162,7 +5167,7 @@ Sema::ActOnFunctionDeclarator(Scope *S, Declarator &D, DeclContext *DC,
if (NewFD->isInvalidDecl()) {
// Ignore all the rest of this.
} else if (!D.isRedeclaration()) {
- struct ActOnFDArgs ExtraArgs = { S, D, DC, TInfo, TemplateParamLists,
+ struct ActOnFDArgs ExtraArgs = { S, D, TemplateParamLists,
AddToScope };
// Fake up an access specifier if it's supposed to be a class member.
if (isa<CXXRecordDecl>(NewFD->getDeclContext()))
@@ -5201,7 +5206,7 @@ Sema::ActOnFunctionDeclarator(Scope *S, Declarator &D, DeclContext *DC,
// whether the parameter types are references).
if (NamedDecl *Result = DiagnoseInvalidRedeclaration(*this, Previous,
- NewFD, false,
+ NewFD,
ExtraArgs)) {
AddToScope = ExtraArgs.AddToScope;
return Result;
@@ -5212,7 +5217,7 @@ Sema::ActOnFunctionDeclarator(Scope *S, Declarator &D, DeclContext *DC,
// to something.
} else if (isFriend && cast<CXXRecordDecl>(CurContext)->isLocalClass()) {
if (NamedDecl *Result = DiagnoseInvalidRedeclaration(*this, Previous,
- NewFD, true,
+ NewFD,
ExtraArgs)) {
AddToScope = ExtraArgs.AddToScope;
return Result;
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
