nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of the lame attempt to prioritize "void" functions at

Browse Source 
statement context; it really isn't helpful in practice (remember
printf!) and we'll be doing other adjustments for statements very soon.

llvm-svn: 114358
This commit is contained in:
Douglas Gregor
2010-09-20 21:25:19 +00:00
parent 9dcf58a546
commit db5c09a8cd
8 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
clang/lib/Sema/SemaCodeComplete.cpp
View File

@@ -625,12 +625,9 @@ void ResultBuilder::AdjustResultPriorityForPreferredType(Result &R) {
CanQualType TC = SemaRef.Context.getCanonicalType(T);
// Check for exactly-matching types (modulo qualifiers).
if (SemaRef.Context.hasSameUnqualifiedType(PreferredType, TC)) {
if (PreferredType->isVoidType())
R.Priority += CCD_VoidMatch;
else
R.Priority /= CCF_ExactTypeMatch;
} // Check for nearly-matching types, based on classification of each.
if (SemaRef.Context.hasSameUnqualifiedType(PreferredType, TC))
R.Priority /= CCF_ExactTypeMatch;
// Check for nearly-matching types, based on classification of each.
else if ((getSimplifiedTypeClass(PreferredType)
== getSimplifiedTypeClass(TC)) &&
!(PreferredType->isEnumeralType() && TC->isEnumeralType()))
@@ -2571,12 +2568,6 @@ void Sema::CodeCompleteOrdinaryName(Scope *S,
break;
case PCC_Statement:
// For statements that are expressions, we prefer to call 'void' functions
// rather than functions that return a result, since then the result would
// be ignored.
Results.setPreferredType(Context.VoidTy);
// Fall through
case PCC_ParenthesizedExpression:
case PCC_Expression:
case PCC_ForInit: