maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix for PR16570: when comparing two function pointers, discard qualifiers when 

comparing non-reference function parameters.  The qualifiers don't matter for
comparisons.

llvm-svn: 187769
This commit is contained in:
Richard Trieu 2013-08-06 03:44:10 +00:00
parent 21de36ba66
commit 08d5085d43
2 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/Sema/SemaOverload.cpp
View File

@ -2584,9 +2584,17 @@ bool Sema::FunctionArgTypesAreEqual(const FunctionProtoType *OldType,
for (FunctionProtoType::arg_type_iterator O = OldType->arg_type_begin(), for (FunctionProtoType::arg_type_iterator O = OldType->arg_type_begin(),
N = NewType->arg_type_begin(), N = NewType->arg_type_begin(),
E = OldType->arg_type_end(); O && (O != E); ++O, ++N) { E = OldType->arg_type_end(); O && (O != E); ++O, ++N) {
if (!Context.hasSameType(*O, *N)) { if (!(*O)->isReferenceType() && !(*N)->isReferenceType()) {
if (ArgPos) *ArgPos = O - OldType->arg_type_begin(); if (!Context.hasSameType(O->getUnqualifiedType(),
return false; N->getUnqualifiedType())) {
if (ArgPos) *ArgPos = O - OldType->arg_type_begin();
return false;
}
} else {
if (!Context.hasSameType(*O, *N)) {
if (ArgPos) *ArgPos = O - OldType->arg_type_begin();
return false;
}
} }
} }
return true; return true;

52
clang/test/SemaCXX/function-pointer-arguments.cpp Normal file
View File

@ -0,0 +1,52 @@
//RUN: %clang_cc1 -fsyntax-only -verify %s
namespace PR16570 {
int f1(int, int);
int f2(const int, int);
int f3(int&, int);
int f4(const int&, int);
void good() {
int(*g1)(int, int) = f1;
int(*g2)(const int, int) = f1;
int(*g3)(volatile int, int) = f1;
int(*g4)(int, int) = f2;
int(*g5)(const int, int) = f2;
int(*g6)(volatile int, int) = f2;
int(*g7)(int&, int) = f3;
int(*g8)(const int&, int) = f4;
}
void bad() {
void (*g1)(int, int) = f1;
// expected-error@-1 {{different return type ('void' vs 'int'}}
const int (*g2)(int, int) = f1;
// expected-error@-1 {{different return type ('const int' vs 'int')}}
int (*g3)(char, int) = f1;
// expected-error@-1 {{type mismatch at 1st parameter ('char' vs 'int')}}
int (*g4)(int, char) = f1;
// expected-error@-1 {{type mismatch at 2nd parameter ('char' vs 'int')}}
int (*g5)(int) = f1;
// expected-error@-1 {{different number of parameters (1 vs 2)}}
int (*g6)(int, int, int) = f1;
// expected-error@-1 {{different number of parameters (3 vs 2)}}
int (*g7)(const int, char) = f1;
// expected-error@-1 {{type mismatch at 2nd parameter ('char' vs 'int')}}
int (*g8)(int, char) = f2;
// expected-error@-1 {{type mismatch at 2nd parameter ('char' vs 'int')}}
int (*g9)(const int&, char) = f3;
// expected-error@-1 {{type mismatch at 1st parameter ('const int &' vs 'int &')}}
int (*g10)(int&, char) = f4;
// expected-error@-1 {{type mismatch at 1st parameter ('int &' vs 'const int &')}}
}
typedef void (*F)(const char * __restrict__, int);
void g(const char *, unsigned);
F f = g;
// expected-error@-1 {{type mismatch at 2nd parameter ('int' vs 'unsigned int')}}
}