mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-23 18:14:13 +08:00
ac03c8d8fd
PR c++/28901 points out a bug in C++ overload resolution. When comparing two overloads, one might be better than the other for certain parameters -- but, if that one also has some invalid conversion, then it should never be considered the better choice. Instead, a valid-but-not-apparently-quite-as-good overload should be preferred. This patch fixes this problem by changing how overload comparisons are done. I don't believe it should affect any currently valid overload resolution; nor should it affect resolutions where all the choices are equally invalid.
250 lines
6.5 KiB
C++
250 lines
6.5 KiB
C++
#include <stddef.h>
|
|
|
|
class foo {
|
|
public:
|
|
foo (int);
|
|
foo (int, const char *);
|
|
foo (foo&);
|
|
~foo ();
|
|
void foofunc (int);
|
|
void foofunc (int, signed char *);
|
|
int ifoo;
|
|
const char *ccpfoo;
|
|
|
|
int overload1arg (void);
|
|
int overload1arg (char);
|
|
int overload1arg (signed char);
|
|
int overload1arg (unsigned char);
|
|
int overload1arg (short);
|
|
int overload1arg (unsigned short);
|
|
int overload1arg (int);
|
|
int overload1arg (unsigned int);
|
|
int overload1arg (long);
|
|
int overload1arg (unsigned long);
|
|
int overload1arg (float);
|
|
int overload1arg (double);
|
|
|
|
int overload1arg (int*);
|
|
int overload1arg (void*);
|
|
|
|
int overloadfnarg (void);
|
|
int overloadfnarg (int);
|
|
int overloadfnarg (int, int (*) (int));
|
|
|
|
int overloadargs (int a1);
|
|
int overloadargs (int a1, int a2);
|
|
int overloadargs (int a1, int a2, int a3);
|
|
int overloadargs (int a1, int a2, int a3, int a4);
|
|
int overloadargs (int a1, int a2, int a3, int a4, int a5);
|
|
int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6);
|
|
int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7);
|
|
int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8);
|
|
int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9);
|
|
int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
|
|
int a8, int a9, int a10);
|
|
int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
|
|
int a8, int a9, int a10, int a11);
|
|
|
|
};
|
|
|
|
struct K {
|
|
static int staticoverload ();
|
|
static int staticoverload (int);
|
|
static int staticoverload (int, int);
|
|
};
|
|
|
|
namespace N {
|
|
int nsoverload () { return 1; }
|
|
int nsoverload (int x) { return x; }
|
|
int nsoverload (int x, int y) { return x + y; }
|
|
};
|
|
|
|
int intToChar (char c) { return 297; }
|
|
|
|
void marker1()
|
|
{}
|
|
|
|
// Now test how overloading and namespaces interact.
|
|
|
|
class dummyClass {};
|
|
|
|
dummyClass dummyInstance;
|
|
|
|
int overloadNamespace(int i)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
int overloadNamespace(dummyClass d)
|
|
{
|
|
return 2;
|
|
}
|
|
|
|
namespace XXX {
|
|
int overloadNamespace (char c)
|
|
{
|
|
return 3;
|
|
}
|
|
|
|
void marker2() {}
|
|
}
|
|
|
|
class A {};
|
|
class B: public A {};
|
|
class C: public B {};
|
|
class D: C {};
|
|
class E {};
|
|
class F {};
|
|
|
|
int bar (A) { return 11; }
|
|
int bar (B) { return 22; }
|
|
|
|
int bar2 (E &, A &) { return 33; }
|
|
int bar2 (F &, B &) { return 44; }
|
|
|
|
int intintfunc (int x) { return x; }
|
|
|
|
int main ()
|
|
{
|
|
char arg2 = 2;
|
|
signed char arg3 =3;
|
|
unsigned char arg4 =4;
|
|
short arg5 =5;
|
|
unsigned short arg6 =6;
|
|
int arg7 =7;
|
|
unsigned int arg8 =8;
|
|
long arg9 =9;
|
|
unsigned long arg10 =10;
|
|
float arg11 =100.0;
|
|
double arg12 = 200.0;
|
|
int arg13 = 200;
|
|
char arg14 = 'a';
|
|
|
|
A a;
|
|
B b;
|
|
C c;
|
|
D d;
|
|
E e;
|
|
F f;
|
|
|
|
bar (a);
|
|
bar (b);
|
|
bar (c);
|
|
|
|
bar2 (e, b);
|
|
bar2 (f, b);
|
|
|
|
char *str = (char *) "A";
|
|
foo foo_instance1(111);
|
|
foo foo_instance2(222, str);
|
|
foo foo_instance3(foo_instance2);
|
|
|
|
// Some calls to ensure all the functions are emitted.
|
|
K::staticoverload();
|
|
K::staticoverload(2);
|
|
K::staticoverload(2, 3);
|
|
N::nsoverload();
|
|
N::nsoverload(2);
|
|
N::nsoverload(2, 3);
|
|
|
|
overloadNamespace (1);
|
|
overloadNamespace (dummyInstance);
|
|
XXX::overloadNamespace ('a');
|
|
|
|
// Verify that intToChar should work:
|
|
intToChar(1);
|
|
|
|
marker1(); // marker1-returns-here
|
|
XXX::marker2(); // marker1-returns-here
|
|
|
|
return 0;
|
|
}
|
|
|
|
foo::foo (int i) { ifoo = i; ccpfoo = NULL; }
|
|
foo::foo (int i, const char *ccp) { ifoo = i; ccpfoo = ccp; }
|
|
foo::foo (foo& afoo) { ifoo = afoo.ifoo; ccpfoo = afoo.ccpfoo;}
|
|
foo::~foo () {}
|
|
|
|
|
|
/* Some functions to test overloading by varying one argument type. */
|
|
|
|
int foo::overload1arg (void) { return 1; }
|
|
int foo::overload1arg (char arg) { arg = 0; return 2;}
|
|
int foo::overload1arg (signed char arg) { arg = 0; return 3;}
|
|
int foo::overload1arg (unsigned char arg) { arg = 0; return 4;}
|
|
int foo::overload1arg (short arg) { arg = 0; return 5;}
|
|
int foo::overload1arg (unsigned short arg) { arg = 0; return 6;}
|
|
int foo::overload1arg (int arg) { arg = 0; return 7;}
|
|
int foo::overload1arg (unsigned int arg) { arg = 0; return 8;}
|
|
int foo::overload1arg (long arg) { arg = 0; return 9;}
|
|
int foo::overload1arg (unsigned long arg) { arg = 0; return 10;}
|
|
int foo::overload1arg (float arg) { arg = 0; return 11;}
|
|
int foo::overload1arg (double arg) { arg = 0; return 12;}
|
|
int foo::overload1arg (int* arg) { arg = 0; return 13;}
|
|
int foo::overload1arg (void* arg) { arg = 0; return 14;}
|
|
|
|
/* Test to see that we can explicitly request overloaded functions
|
|
with function pointers in the prototype. */
|
|
|
|
int foo::overloadfnarg (void) { return ifoo * 20; }
|
|
int foo::overloadfnarg (int arg) { arg = 0; return 13;}
|
|
int foo::overloadfnarg (int arg, int (*foo) (int)) { return foo(arg); }
|
|
|
|
/* Some functions to test overloading by varying argument count. */
|
|
|
|
int foo::overloadargs (int a1)
|
|
{ a1 = 0;
|
|
return 1;}
|
|
|
|
int foo::overloadargs (int a1, int a2)
|
|
{ a1 = a2 = 0;
|
|
return 2;}
|
|
|
|
int foo::overloadargs (int a1, int a2, int a3)
|
|
{ a1 = a2 = a3 = 0;
|
|
return 3;}
|
|
|
|
int foo::overloadargs (int a1, int a2, int a3, int a4)
|
|
{ a1 = a2 = a3 = a4 = 0;
|
|
return 4;}
|
|
|
|
int foo::overloadargs (int a1, int a2, int a3, int a4, int a5)
|
|
{ a1 = a2 = a3 = a4 = a5 = 0;
|
|
return 5;}
|
|
|
|
int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6)
|
|
{ a1 = a2 = a3 = a4 = a5 = a6 = 0;
|
|
return 6;}
|
|
|
|
int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7)
|
|
{ a1 = a2 = a3 = a4 = a5 = a6 = a7 = 0;
|
|
return 7;}
|
|
|
|
int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
|
|
int a8)
|
|
{ a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = 0;
|
|
return 8;}
|
|
|
|
int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
|
|
int a8, int a9)
|
|
{
|
|
a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 = 0;
|
|
return 9;
|
|
}
|
|
|
|
int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
|
|
int a8, int a9, int a10)
|
|
{ a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 =
|
|
a10 = 0; return 10;}
|
|
|
|
int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
|
|
int a8, int a9, int a10, int a11)
|
|
{ a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 =
|
|
a10 = a11 = 0; return 11;}
|
|
|
|
|
|
|
|
int K::staticoverload () { return 1; }
|
|
int K::staticoverload (int x) { return x; }
|
|
int K::staticoverload (int x, int y) { return x + y; }
|