From 008d5fccd8a264d12330914f5b14e74a51c9ef03 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 14 Oct 2011 14:43:03 +0000 Subject: [PATCH] re PR c++/38174 (Missing some built-in candidates for operator overloading) /cp 2011-10-14 Paolo Carlini PR c++/38174 * call.c (add_builtin_candidate): If two pointers have a composite pointer type, generate a single candidate with that type. /testsuite 2011-10-14 Paolo Carlini PR c++/38174 * g++.dg/overload/operator4.C: New. From-SVN: r179984 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/call.c | 15 +++++++++++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/overload/operator4.C | 14 ++++++++++++++ 4 files changed, 40 insertions(+) create mode 100644 gcc/testsuite/g++.dg/overload/operator4.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9a214b57bd9a..aac66d540b41 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-10-14 Paolo Carlini + + PR c++/38174 + * call.c (add_builtin_candidate): If two pointers have a composite + pointer type, generate a single candidate with that type. + 2011-10-13 Jason Merrill PR c++/50614 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 7219afe8f59e..7e87bdfea026 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -2582,6 +2582,21 @@ add_builtin_candidate (struct z_candidate **candidates, enum tree_code code, || MAYBE_CLASS_TYPE_P (type1) || TREE_CODE (type1) == ENUMERAL_TYPE)) { + if (TYPE_PTR_P (type1) || TYPE_PTR_TO_MEMBER_P (type1)) + { + tree cptype = composite_pointer_type (type1, type2, + error_mark_node, + error_mark_node, + CPO_CONVERSION, + tf_none); + if (cptype != error_mark_node) + { + build_builtin_candidate + (candidates, fnname, cptype, cptype, args, argtypes, flags); + return; + } + } + build_builtin_candidate (candidates, fnname, type1, type1, args, argtypes, flags); build_builtin_candidate diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2a475abc0e8f..e04f5277d027 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-10-14 Paolo Carlini + + PR c++/38174 + * g++.dg/overload/operator4.C: New. + 2011-10-14 David Alan Gilbert * gcc.dg/di-longlong64-sync-1.c: New test. diff --git a/gcc/testsuite/g++.dg/overload/operator4.C b/gcc/testsuite/g++.dg/overload/operator4.C new file mode 100644 index 000000000000..3ec1eb472dd9 --- /dev/null +++ b/gcc/testsuite/g++.dg/overload/operator4.C @@ -0,0 +1,14 @@ +// PR c++/38174 + +struct VolatileIntPtr { + operator int volatile *(); +}; + +struct ConstIntPtr { + operator int const *(); +}; + +void test_with_ptrs(VolatileIntPtr vip, ConstIntPtr cip) { + bool b1 = (vip == cip); + long p1 = vip - cip; +} -- 2.47.2