diff options
| author | Jason Merrill <jason@redhat.com> | 2013-02-05 22:33:45 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2013-02-05 22:33:45 -0500 |
| commit | 29ef6cd035bda26987bd4a69a91b66908654b01b (patch) | |
| tree | 42f7927c901ee01127e95a2d482eeea50768f387 /gcc | |
| parent | bda9912058a37c428d7fabe624798b241f8ba728 (diff) | |
| download | gcc-29ef6cd035bda26987bd4a69a91b66908654b01b.zip gcc-29ef6cd035bda26987bd4a69a91b66908654b01b.tar.gz gcc-29ef6cd035bda26987bd4a69a91b66908654b01b.tar.bz2 | |
re PR c++/56208 (Some classic sfinae cases fail to work due to access problems)
PR c++/56208
* pt.c (fn_type_unification): Discard any access checks from
substituting explicit args.
From-SVN: r195779
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/sfinae43.C | 31 |
3 files changed, 43 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7bd5402..ce0bfad 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2013-02-05 Jason Merrill <jason@redhat.com> + + PR c++/56208 + * pt.c (fn_type_unification): Discard any access checks from + substituting explicit args. + 2013-01-31 Jason Merrill <jason@redhat.com> PR c++/56162 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 7430289..aa127ed 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -14989,6 +14989,12 @@ fn_type_unification (tree fn, if (fntype == error_mark_node) goto fail; + /* Throw away these access checks; we'll see them again in + instantiate_template and they might have the wrong + access path at this point. */ + pop_deferring_access_checks (); + push_deferring_access_checks (dk_deferred); + /* Place the explicitly specified arguments in TARGS. */ for (i = NUM_TMPL_ARGS (explicit_targs); i--;) TREE_VEC_ELT (targs, i) = TREE_VEC_ELT (explicit_targs, i); diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae43.C b/gcc/testsuite/g++.dg/cpp0x/sfinae43.C new file mode 100644 index 0000000..22efe65 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/sfinae43.C @@ -0,0 +1,31 @@ +// PR c++/56208 +// { dg-options -std=c++11 } + +struct ostream { + ostream& operator<<(int); +}; + +struct sfinae_base { + + typedef char one; + typedef char (&two)[2]; + + template<class T> + static T make(); + + template<unsigned> struct ok { typedef int type; }; + + template<class U, class T> + static one test(decltype((make<U>() << make<T>()), 0)); + + template<class, class> + static two test(...); +}; + +template<class T> +struct is_printable : private sfinae_base +{ + enum { value = sizeof(test<ostream&, T>(0)) == sizeof(one) }; +}; + +typedef int ok[is_printable<int>::value ? 1 : -1]; |