feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: fix follow symbol for const arguments

Browse Source 
Fixed case:

class Foo {};
void foo(int v) {}
void foo(const char *v) {}
void foo(const Foo &v) {}
void foo(char v) {}

void test()
{
    foo(5);
    foo("hoo");
    foo('a');
    char *var = "var";
    foo(var); // Jumps to last override, regardless of its type
    Foo f;
    foo(f); // Jumps to last override
}

Task-number: QTCREATORBUG-13128
Change-Id: I038553bb3bdbe1c300fc01573c14b6fedf0320cd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Przemyslaw Gorszkowski
2014-10-07 10:01:14 +02:00
committed by Nikolai Kosjar
parent 2de666da61
commit 0ff1cba77b
4 changed files with 105 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/libs/cplusplus/ResolveExpression.cpp
View File

@@ -200,6 +200,36 @@ private:
ClassOrNamespace *_binding;
};
static int evaluateFunctionArgument(const FullySpecifiedType &actualTy,
const FullySpecifiedType &formalTy)
{
int score = 0;
if (actualTy.type()->match(formalTy.type())) {
++score;
if (actualTy.isConst() == formalTy.isConst())
++score;
} else if (actualTy.simplified().type()->match(formalTy.simplified().type())) {
++score;
if (actualTy.simplified().isConst() == formalTy.simplified().isConst())
++score;
} else {
PointerType *actualAsPointer = actualTy.type()->asPointerType();
PointerType *formalAsPointer = formalTy.type()->asPointerType();
if (actualAsPointer && formalAsPointer) {
FullySpecifiedType actualElementType = actualAsPointer->elementType();
FullySpecifiedType formalElementType = formalAsPointer->elementType();
if (actualElementType.type()->match(formalElementType.type())) {
++score;
if (actualElementType.isConst() == formalElementType.isConst())
++score;
}
}
}
return score;
}
} // end of anonymous namespace
/////////////////////////////////////////////////////////////////////
@@ -771,15 +801,6 @@ bool ResolveExpression::maybeValidPrototype(Function *funTy, unsigned actualArgu
return funTy->maybeValidPrototype(actualArgumentCount);
}
bool ResolveExpression::implicitConversion(const FullySpecifiedType &sourceTy, const FullySpecifiedType &targetTy) const
{
if (sourceTy.match(targetTy))
return true;
else if (sourceTy.simplified().match(targetTy.simplified()))
return true;
return false;
}
bool ResolveExpression::visit(CallAST *ast)
{
const QList<LookupItem> baseResults = resolve(ast->base_expression, _scope);
@@ -820,11 +841,13 @@ bool ResolveExpression::visit(CallAST *ast)
continue;
actualTy = actual.first().type();
} else
} else {
actualTy = formalTy;
score += 2;
continue;
}
if (implicitConversion(actualTy, formalTy))
++score;
score += evaluateFunctionArgument(actualTy, formalTy);
}
sortedResults.insert(LookupMap::value_type(-score, base));