microsoft
/
clang-1
зеркало из https://github.com/microsoft/clang-1.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

So I was sitting around, trying vainly to think of something to commit, and then 

I said to myself, self, why don't you go add a couple of parameters to a method
and then fail to use them, and I thought that sounded like a pretty good idea,
so I did it.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@93233 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
John McCall 2010-01-12 07:18:19 +00:00
Родитель 834389b874
Коммит cbce60633c
5 изменённых файлов: 42 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
lib/Sema/Sema.h
Просмотреть файл

@ -1040,6 +1040,7 @@ public:
}; };
void PrintOverloadCandidates(OverloadCandidateSet& CandidateSet, void PrintOverloadCandidates(OverloadCandidateSet& CandidateSet,
OverloadCandidateDisplayKind OCD, OverloadCandidateDisplayKind OCD,
Expr **Args, unsigned NumArgs,
const char *Opc = 0, const char *Opc = 0,
SourceLocation Loc = SourceLocation()); SourceLocation Loc = SourceLocation());

8
lib/Sema/SemaDeclCXX.cpp
Просмотреть файл

@ -4200,7 +4200,7 @@ Sema::PerformInitializationByConstructor(QualType ClassType,
else else
Diag(Loc, diag::err_ovl_no_viable_function_in_init) Diag(Loc, diag::err_ovl_no_viable_function_in_init)
<< ClassType << Range; << ClassType << Range;
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, NumArgs);
return 0; return 0;
case OR_Ambiguous: case OR_Ambiguous:
@ -4208,7 +4208,7 @@ Sema::PerformInitializationByConstructor(QualType ClassType,
Diag(Loc, diag::err_ovl_ambiguous_init) << InitEntity << Range; Diag(Loc, diag::err_ovl_ambiguous_init) << InitEntity << Range;
else else
Diag(Loc, diag::err_ovl_ambiguous_init) << ClassType << Range; Diag(Loc, diag::err_ovl_ambiguous_init) << ClassType << Range;
PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates); PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates, Args, NumArgs);
return 0; return 0;
case OR_Deleted: case OR_Deleted:
@ -4223,7 +4223,7 @@ Sema::PerformInitializationByConstructor(QualType ClassType,
<< Best->Function->isDeleted() << Best->Function->isDeleted()
<< RD->getDeclName() << Range; << RD->getDeclName() << Range;
} }
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, NumArgs);
return 0; return 0;
} }
@ -4547,7 +4547,7 @@ Sema::CheckReferenceInit(Expr *&Init, QualType DeclType,
} }
Diag(DeclLoc, diag::err_ref_init_ambiguous) << DeclType << Init->getType() Diag(DeclLoc, diag::err_ref_init_ambiguous) << DeclType << Init->getType()
<< Init->getSourceRange(); << Init->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates); PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates, &Init, 1);
return true; return true;
case OR_No_Viable_Function: case OR_No_Viable_Function:

6
lib/Sema/SemaExprCXX.cpp
Просмотреть файл

@ -673,20 +673,20 @@ bool Sema::FindAllocationOverload(SourceLocation StartLoc, SourceRange Range,
case OR_No_Viable_Function: case OR_No_Viable_Function:
Diag(StartLoc, diag::err_ovl_no_viable_function_in_call) Diag(StartLoc, diag::err_ovl_no_viable_function_in_call)
<< Name << Range; << Name << Range;
PrintOverloadCandidates(Candidates, OCD_AllCandidates); PrintOverloadCandidates(Candidates, OCD_AllCandidates, Args, NumArgs);
return true; return true;
case OR_Ambiguous: case OR_Ambiguous:
Diag(StartLoc, diag::err_ovl_ambiguous_call) Diag(StartLoc, diag::err_ovl_ambiguous_call)
<< Name << Range; << Name << Range;
PrintOverloadCandidates(Candidates, OCD_ViableCandidates); PrintOverloadCandidates(Candidates, OCD_ViableCandidates, Args, NumArgs);
return true; return true;
case OR_Deleted: case OR_Deleted:
Diag(StartLoc, diag::err_ovl_deleted_call) Diag(StartLoc, diag::err_ovl_deleted_call)
<< Best->Function->isDeleted() << Best->Function->isDeleted()
<< Name << Range; << Name << Range;
PrintOverloadCandidates(Candidates, OCD_AllCandidates); PrintOverloadCandidates(Candidates, OCD_AllCandidates, Args, NumArgs);
return true; return true;
} }
assert(false && "Unreachable, bad result from BestViableFunction"); assert(false && "Unreachable, bad result from BestViableFunction");

19
lib/Sema/SemaInit.cpp
Просмотреть файл

@ -88,7 +88,7 @@ static bool CheckSingleInitializer(Expr *&Init, QualType DeclType,
S.Diag(Init->getSourceRange().getBegin(), S.Diag(Init->getSourceRange().getBegin(),
diag::err_typecheck_convert_ambiguous) diag::err_typecheck_convert_ambiguous)
<< DeclType << Init->getType() << Init->getSourceRange(); << DeclType << Init->getType() << Init->getSourceRange();
S.PrintOverloadCandidates(CandidateSet, Sema::OCD_AllCandidates); S.PrintOverloadCandidates(CandidateSet, Sema::OCD_AllCandidates, &Init, 1);
return true; return true;
} }
return false; return false;
@ -3015,14 +3015,16 @@ static Sema::OwningExprResult CopyIfRequiredForEntity(Sema &S,
S.Diag(Loc, diag::err_temp_copy_no_viable) S.Diag(Loc, diag::err_temp_copy_no_viable)
<< (int)Entity.getKind() << CurInitExpr->getType() << (int)Entity.getKind() << CurInitExpr->getType()
<< CurInitExpr->getSourceRange(); << CurInitExpr->getSourceRange();
S.PrintOverloadCandidates(CandidateSet, Sema::OCD_AllCandidates); S.PrintOverloadCandidates(CandidateSet, Sema::OCD_AllCandidates,
&CurInitExpr, 1);
return S.ExprError(); return S.ExprError();
case OR_Ambiguous: case OR_Ambiguous:
S.Diag(Loc, diag::err_temp_copy_ambiguous) S.Diag(Loc, diag::err_temp_copy_ambiguous)
<< (int)Entity.getKind() << CurInitExpr->getType() << (int)Entity.getKind() << CurInitExpr->getType()
<< CurInitExpr->getSourceRange(); << CurInitExpr->getSourceRange();
S.PrintOverloadCandidates(CandidateSet, Sema::OCD_ViableCandidates); S.PrintOverloadCandidates(CandidateSet, Sema::OCD_ViableCandidates,
&CurInitExpr, 1);
return S.ExprError(); return S.ExprError();
case OR_Deleted: case OR_Deleted:
@ -3437,14 +3439,16 @@ bool InitializationSequence::Diagnose(Sema &S,
<< DestType << Args[0]->getType() << DestType << Args[0]->getType()
<< Args[0]->getSourceRange(); << Args[0]->getSourceRange();
S.PrintOverloadCandidates(FailedCandidateSet, Sema::OCD_ViableCandidates); S.PrintOverloadCandidates(FailedCandidateSet, Sema::OCD_ViableCandidates,
Args, NumArgs);
break; break;
case OR_No_Viable_Function: case OR_No_Viable_Function:
S.Diag(Kind.getLocation(), diag::err_typecheck_nonviable_condition) S.Diag(Kind.getLocation(), diag::err_typecheck_nonviable_condition)
<< Args[0]->getType() << DestType.getNonReferenceType() << Args[0]->getType() << DestType.getNonReferenceType()
<< Args[0]->getSourceRange(); << Args[0]->getSourceRange();
S.PrintOverloadCandidates(FailedCandidateSet, Sema::OCD_AllCandidates); S.PrintOverloadCandidates(FailedCandidateSet, Sema::OCD_AllCandidates,
Args, NumArgs);
break; break;
case OR_Deleted: { case OR_Deleted: {
@ -3547,13 +3551,14 @@ bool InitializationSequence::Diagnose(Sema &S,
S.Diag(Kind.getLocation(), diag::err_ovl_ambiguous_init) S.Diag(Kind.getLocation(), diag::err_ovl_ambiguous_init)
<< DestType << ArgsRange; << DestType << ArgsRange;
S.PrintOverloadCandidates(FailedCandidateSet, S.PrintOverloadCandidates(FailedCandidateSet,
Sema::OCD_ViableCandidates); Sema::OCD_ViableCandidates, Args, NumArgs);
break; break;
case OR_No_Viable_Function: case OR_No_Viable_Function:
S.Diag(Kind.getLocation(), diag::err_ovl_no_viable_function_in_init) S.Diag(Kind.getLocation(), diag::err_ovl_no_viable_function_in_init)
<< DestType << ArgsRange; << DestType << ArgsRange;
S.PrintOverloadCandidates(FailedCandidateSet, Sema::OCD_AllCandidates); S.PrintOverloadCandidates(FailedCandidateSet, Sema::OCD_AllCandidates,
Args, NumArgs);
break; break;
case OR_Deleted: { case OR_Deleted: {

43
lib/Sema/SemaOverload.cpp
Просмотреть файл

@ -1631,7 +1631,7 @@ Sema::DiagnoseMultipleUserDefinedConversion(Expr *From, QualType ToType) {
<< From->getType() << ToType << From->getSourceRange(); << From->getType() << ToType << From->getSourceRange();
else else
return false; return false;
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, &From, 1);
return true; return true;
} }
@ -4484,6 +4484,7 @@ struct CompareOverloadCandidatesForDisplay {
void void
Sema::PrintOverloadCandidates(OverloadCandidateSet& CandidateSet, Sema::PrintOverloadCandidates(OverloadCandidateSet& CandidateSet,
OverloadCandidateDisplayKind OCD, OverloadCandidateDisplayKind OCD,
Expr **Args, unsigned NumArgs,
const char *Opc, const char *Opc,
SourceLocation OpLoc) { SourceLocation OpLoc) {
// Sort the candidates by viability and position. Sorting directly would // Sort the candidates by viability and position. Sorting directly would
@ -5032,13 +5033,13 @@ Sema::BuildOverloadedCallExpr(Expr *Fn, UnresolvedLookupExpr *ULE,
Diag(Fn->getSourceRange().getBegin(), Diag(Fn->getSourceRange().getBegin(),
diag::err_ovl_no_viable_function_in_call) diag::err_ovl_no_viable_function_in_call)
<< ULE->getName() << Fn->getSourceRange(); << ULE->getName() << Fn->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, NumArgs);
break; break;
case OR_Ambiguous: case OR_Ambiguous:
Diag(Fn->getSourceRange().getBegin(), diag::err_ovl_ambiguous_call) Diag(Fn->getSourceRange().getBegin(), diag::err_ovl_ambiguous_call)
<< ULE->getName() << Fn->getSourceRange(); << ULE->getName() << Fn->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates); PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates, Args, NumArgs);
break; break;
case OR_Deleted: case OR_Deleted:
@ -5046,7 +5047,7 @@ Sema::BuildOverloadedCallExpr(Expr *Fn, UnresolvedLookupExpr *ULE,
<< Best->Function->isDeleted() << Best->Function->isDeleted()
<< ULE->getName() << ULE->getName()
<< Fn->getSourceRange(); << Fn->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, NumArgs);
break; break;
} }
@ -5201,7 +5202,7 @@ Sema::OwningExprResult Sema::CreateOverloadedUnaryOp(SourceLocation OpLoc,
Diag(OpLoc, diag::err_ovl_ambiguous_oper) Diag(OpLoc, diag::err_ovl_ambiguous_oper)
<< UnaryOperator::getOpcodeStr(Opc) << UnaryOperator::getOpcodeStr(Opc)
<< Input->getSourceRange(); << Input->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates, PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates, Args, NumArgs,
UnaryOperator::getOpcodeStr(Opc), OpLoc); UnaryOperator::getOpcodeStr(Opc), OpLoc);
return ExprError(); return ExprError();
@ -5210,7 +5211,7 @@ Sema::OwningExprResult Sema::CreateOverloadedUnaryOp(SourceLocation OpLoc,
<< Best->Function->isDeleted() << Best->Function->isDeleted()
<< UnaryOperator::getOpcodeStr(Opc) << UnaryOperator::getOpcodeStr(Opc)
<< Input->getSourceRange(); << Input->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, NumArgs);
return ExprError(); return ExprError();
} }
@ -5417,7 +5418,7 @@ Sema::CreateOverloadedBinOp(SourceLocation OpLoc,
assert(Result.isInvalid() && assert(Result.isInvalid() &&
"C++ binary operator overloading is missing candidates!"); "C++ binary operator overloading is missing candidates!");
if (Result.isInvalid()) if (Result.isInvalid())
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, 2,
BinaryOperator::getOpcodeStr(Opc), OpLoc); BinaryOperator::getOpcodeStr(Opc), OpLoc);
return move(Result); return move(Result);
} }
@ -5426,7 +5427,7 @@ Sema::CreateOverloadedBinOp(SourceLocation OpLoc,
Diag(OpLoc, diag::err_ovl_ambiguous_oper) Diag(OpLoc, diag::err_ovl_ambiguous_oper)
<< BinaryOperator::getOpcodeStr(Opc) << BinaryOperator::getOpcodeStr(Opc)
<< Args[0]->getSourceRange() << Args[1]->getSourceRange(); << Args[0]->getSourceRange() << Args[1]->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates, PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates, Args, 2,
BinaryOperator::getOpcodeStr(Opc), OpLoc); BinaryOperator::getOpcodeStr(Opc), OpLoc);
return ExprError(); return ExprError();
@ -5435,7 +5436,7 @@ Sema::CreateOverloadedBinOp(SourceLocation OpLoc,
<< Best->Function->isDeleted() << Best->Function->isDeleted()
<< BinaryOperator::getOpcodeStr(Opc) << BinaryOperator::getOpcodeStr(Opc)
<< Args[0]->getSourceRange() << Args[1]->getSourceRange(); << Args[0]->getSourceRange() << Args[1]->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, 2);
return ExprError(); return ExprError();
} }
@ -5545,7 +5546,7 @@ Sema::CreateOverloadedArraySubscriptExpr(SourceLocation LLoc,
Diag(LLoc, diag::err_ovl_no_viable_subscript) Diag(LLoc, diag::err_ovl_no_viable_subscript)
<< Args[0]->getType() << Args[0]->getType()
<< Args[0]->getSourceRange() << Args[1]->getSourceRange(); << Args[0]->getSourceRange() << Args[1]->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, 2,
"[]", LLoc); "[]", LLoc);
return ExprError(); return ExprError();
} }
@ -5553,7 +5554,7 @@ Sema::CreateOverloadedArraySubscriptExpr(SourceLocation LLoc,
case OR_Ambiguous: case OR_Ambiguous:
Diag(LLoc, diag::err_ovl_ambiguous_oper) Diag(LLoc, diag::err_ovl_ambiguous_oper)
<< "[]" << Args[0]->getSourceRange() << Args[1]->getSourceRange(); << "[]" << Args[0]->getSourceRange() << Args[1]->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates, PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates, Args, 2,
"[]", LLoc); "[]", LLoc);
return ExprError(); return ExprError();
@ -5561,7 +5562,7 @@ Sema::CreateOverloadedArraySubscriptExpr(SourceLocation LLoc,
Diag(LLoc, diag::err_ovl_deleted_oper) Diag(LLoc, diag::err_ovl_deleted_oper)
<< Best->Function->isDeleted() << "[]" << Best->Function->isDeleted() << "[]"
<< Args[0]->getSourceRange() << Args[1]->getSourceRange(); << Args[0]->getSourceRange() << Args[1]->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, 2,
"[]", LLoc); "[]", LLoc);
return ExprError(); return ExprError();
} }
@ -5646,14 +5647,14 @@ Sema::BuildCallToMemberFunction(Scope *S, Expr *MemExprE,
Diag(UnresExpr->getMemberLoc(), Diag(UnresExpr->getMemberLoc(),
diag::err_ovl_no_viable_member_function_in_call) diag::err_ovl_no_viable_member_function_in_call)
<< DeclName << MemExprE->getSourceRange(); << DeclName << MemExprE->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, NumArgs);
// FIXME: Leaking incoming expressions! // FIXME: Leaking incoming expressions!
return ExprError(); return ExprError();
case OR_Ambiguous: case OR_Ambiguous:
Diag(UnresExpr->getMemberLoc(), diag::err_ovl_ambiguous_member_call) Diag(UnresExpr->getMemberLoc(), diag::err_ovl_ambiguous_member_call)
<< DeclName << MemExprE->getSourceRange(); << DeclName << MemExprE->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, NumArgs);
// FIXME: Leaking incoming expressions! // FIXME: Leaking incoming expressions!
return ExprError(); return ExprError();
@ -5661,7 +5662,7 @@ Sema::BuildCallToMemberFunction(Scope *S, Expr *MemExprE,
Diag(UnresExpr->getMemberLoc(), diag::err_ovl_deleted_member_call) Diag(UnresExpr->getMemberLoc(), diag::err_ovl_deleted_member_call)
<< Best->Function->isDeleted() << Best->Function->isDeleted()
<< DeclName << MemExprE->getSourceRange(); << DeclName << MemExprE->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, NumArgs);
// FIXME: Leaking incoming expressions! // FIXME: Leaking incoming expressions!
return ExprError(); return ExprError();
} }
@ -5809,14 +5810,14 @@ Sema::BuildCallToObjectOfClassType(Scope *S, Expr *Object,
Diag(Object->getSourceRange().getBegin(), Diag(Object->getSourceRange().getBegin(),
diag::err_ovl_no_viable_object_call) diag::err_ovl_no_viable_object_call)
<< Object->getType() << Object->getSourceRange(); << Object->getType() << Object->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, NumArgs);
break; break;
case OR_Ambiguous: case OR_Ambiguous:
Diag(Object->getSourceRange().getBegin(), Diag(Object->getSourceRange().getBegin(),
diag::err_ovl_ambiguous_object_call) diag::err_ovl_ambiguous_object_call)
<< Object->getType() << Object->getSourceRange(); << Object->getType() << Object->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates); PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates, Args, NumArgs);
break; break;
case OR_Deleted: case OR_Deleted:
@ -5824,7 +5825,7 @@ Sema::BuildCallToObjectOfClassType(Scope *S, Expr *Object,
diag::err_ovl_deleted_object_call) diag::err_ovl_deleted_object_call)
<< Best->Function->isDeleted() << Best->Function->isDeleted()
<< Object->getType() << Object->getSourceRange(); << Object->getType() << Object->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, Args, NumArgs);
break; break;
} }
@ -6005,20 +6006,20 @@ Sema::BuildOverloadedArrowExpr(Scope *S, ExprArg BaseIn, SourceLocation OpLoc) {
else else
Diag(OpLoc, diag::err_ovl_no_viable_oper) Diag(OpLoc, diag::err_ovl_no_viable_oper)
<< "operator->" << Base->getSourceRange(); << "operator->" << Base->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, &Base, 1);
return ExprError(); return ExprError();
case OR_Ambiguous: case OR_Ambiguous:
Diag(OpLoc, diag::err_ovl_ambiguous_oper) Diag(OpLoc, diag::err_ovl_ambiguous_oper)
<< "->" << Base->getSourceRange(); << "->" << Base->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates); PrintOverloadCandidates(CandidateSet, OCD_ViableCandidates, &Base, 1);
return ExprError(); return ExprError();
case OR_Deleted: case OR_Deleted:
Diag(OpLoc, diag::err_ovl_deleted_oper) Diag(OpLoc, diag::err_ovl_deleted_oper)
<< Best->Function->isDeleted() << Best->Function->isDeleted()
<< "->" << Base->getSourceRange(); << "->" << Base->getSourceRange();
PrintOverloadCandidates(CandidateSet, OCD_AllCandidates); PrintOverloadCandidates(CandidateSet, OCD_AllCandidates, &Base, 1);
return ExprError(); return ExprError();
} }