From 8e86218f05c1a866b43ae5af3e303f91fb6d7ff0 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 25 Nov 2021 08:39:35 +0100 Subject: [PATCH] c++: Return early in apply_late_template_attributes if there are no late attribs [PR101180] The r12-299-ga0fdff3cf33f7284 change can result in cplus_decl_attributes being called even if there are no late attributes (but at least one early attribute) in apply_late_template_attributes. This patch fixes that, so that we return early if there are no late attrs, only arrange for TYPE_ATTRIBUTES to get the early attribute list. 2021-11-25 Jakub Jelinek PR c++/101180 * pt.c (apply_late_template_attributes): Return early if there are no dependent attributes. --- gcc/cp/pt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 49e5745410ed..221628ad3a3f 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -11712,6 +11712,9 @@ apply_late_template_attributes (tree *decl_p, tree attributes, int attr_flags, /* Apply any non-dependent attributes. */ *p = nondep; + if (nondep == attributes) + return true; + /* And then any dependent ones. */ tree late_attrs = NULL_TREE; tree *q = &late_attrs; -- 2.47.2