From: Jason Merrill Date: Mon, 25 Mar 2019 18:27:08 +0000 (-0400) Subject: PR c++/87748 - substitution failure error with decltype. X-Git-Tag: upstream/12.2.0~25499 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b25e675d7de70c530a1ac50f726179c9fd54f161;p=platform%2Fupstream%2Fgcc.git PR c++/87748 - substitution failure error with decltype. This issue is similar to PR 87480; in both cases we were doing non-dependent substitution with processing_template_decl set, leading to member access expressions seeming still instantiation-dependent, and therefore decltype not being simplified to its actual type. And as in that PR, the fix is to clear processing_template_decl while substituting a default template argument. * pt.c (most_specialized_partial_spec): Clear processing_template_decl. From-SVN: r269921 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 04f5639..5739c38 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2019-03-25 Jason Merrill + + PR c++/87748 - substitution failure error with decltype. + * pt.c (most_specialized_partial_spec): Clear + processing_template_decl. + 2019-03-25 Marek Polacek PR c++/89214 - ICE when initializing aggregates with bases. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index afb7ece..05d5371 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -23550,6 +23550,11 @@ most_specialized_partial_spec (tree target, tsubst_flags_t complain) args = INNERMOST_TEMPLATE_ARGS (args); } + /* The caller hasn't called push_to_top_level yet, but we need + get_partial_spec_bindings to be done in non-template context so that we'll + fully resolve everything. */ + processing_template_decl_sentinel ptds; + for (t = DECL_TEMPLATE_SPECIALIZATIONS (main_tmpl); t; t = TREE_CHAIN (t)) { tree spec_args; diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae64.C b/gcc/testsuite/g++.dg/cpp0x/sfinae64.C new file mode 100644 index 0000000..f35b812 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/sfinae64.C @@ -0,0 +1,69 @@ +// PR c++/87748 +// { dg-do compile { target c++11 } } + +template T&& declval(); +template struct enable_if; +template struct enable_if { typedef T type; }; +struct true_type { static const bool value = true; }; +struct false_type { static const bool value = false; }; + +struct string +{ + string (const char *p); +}; + +/// Template to map all type arguments to void, useful for SFINAE, see also WG21 N3911. +template using void_t = void; + +/// REQUIRES - Simplified version of enable_if<> to use SFINAE in function templates. +template using REQUIRES = typename ::enable_if::type; + +/// DerivesString - Check if @a T is of type 'string'. +template struct DerivesString +{ + static const int value = __is_same_as (T, string); +}; + +/// Has__aida_visit__ - Check if @a T provides a member template __aida_visit__<>(Visitor). +template struct Has__aida_visit__ : false_type {}; +template +struct Has__aida_visit__().template __aida_visit__ (*(V*) 0)) >> : true_type {}; + +struct Foo { + template void __accept__ (V*); +}; + +/// Base template for Visitor classes, dispatches operator() to visit_() methods. +template +class VisitorDispatcher { + DerivedVisitor* derived () { return static_cast (this); } +protected: + typedef const char* Name; ///< Member name argument type for visit() methods. +public: + + // dispatch for calls like: visitor (field, "field"); + + template::value) > = true> + void operator() (A &a, Name n) + { return derived()->visit_string (a, n); } +}; + +class PspecVisitor : public VisitorDispatcher { +public: + void visit_string (::string &a, Name name); +}; + +int +main (int argc, char *argv[]) +{ +#ifdef WITHASSERT // define this to fix g++-8.1.1 + static_assert (Has__aida_visit__::value == false, ""); +#endif + PspecVisitor v; + string str ("A string"); + v (str, "some_string"); + static_assert (Has__aida_visit__::value == false, ""); + return 0; +} +// g++ -std=gnu++14 -Wall -O2 aidavisit.cc && ./a.out