From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 4798D385742C; Thu, 28 Apr 2022 17:11:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4798D385742C MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5] c++: partial ordering and dependent operator expr [PR105425] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: 1a5ae012ff3303a8232a03ac9a0925c709775076 X-Git-Newrev: 509fd16da8528444dccc98cef57a18a295c3f1b4 Message-Id: <20220428171112.4798D385742C@sourceware.org> Date: Thu, 28 Apr 2022 17:11:12 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2022 17:11:12 -0000 https://gcc.gnu.org/g:509fd16da8528444dccc98cef57a18a295c3f1b4 commit r13-5-g509fd16da8528444dccc98cef57a18a295c3f1b4 Author: Patrick Palka Date: Thu Apr 28 13:10:56 2022 -0400 c++: partial ordering and dependent operator expr [PR105425] Here ever since r12-6022-gbb2a7f80a98de3 we stopped deeming the partial specialization #2 to be more specialized than #1 ultimately because dependent operator expressions now have a DEPENDENT_OPERATOR_TYPE type instead of an empty type, and this made unify stop deducing T(2) == 1 for K during partial ordering for #1 and #2. This minimal patch fixes this by making the relevant logic in unify treat DEPENDENT_OPERATOR_TYPE like an empty type. PR c++/105425 gcc/cp/ChangeLog: * pt.cc (unify) : Treat DEPENDENT_OPERATOR_TYPE like an empty type. gcc/testsuite/ChangeLog: * g++.dg/template/partial-specialization13.C: New test. Diff: --- gcc/cp/pt.cc | 3 ++- gcc/testsuite/g++.dg/template/partial-specialization13.C | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index e785c5db142..81f7ef5c42b 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -24276,7 +24276,8 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict, } } - if (!TREE_TYPE (arg)) + if (!TREE_TYPE (arg) + || TREE_CODE (TREE_TYPE (arg)) == DEPENDENT_OPERATOR_TYPE) /* Template-parameter dependent expression. Just accept it for now. It will later be processed in convert_template_argument. */ ; diff --git a/gcc/testsuite/g++.dg/template/partial-specialization13.C b/gcc/testsuite/g++.dg/template/partial-specialization13.C new file mode 100644 index 00000000000..b0903f0d60a --- /dev/null +++ b/gcc/testsuite/g++.dg/template/partial-specialization13.C @@ -0,0 +1,11 @@ +// PR c++/105425 +// { dg-do compile { target c++11 } } + +template struct when; +template struct A; +template struct A>; // #1 +template struct A> {}; // #2 +A> a1; // { dg-error "incomplete" } +A> a2; +A> a3; +A> a4; // { dg-error "incomplete" }