From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1059) id 33C93385843B; Wed, 5 Jan 2022 12:16:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33C93385843B MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Nathan Sidwell To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6255] [c++] Adjust mark used member in instantiated class scope X-Act-Checkin: gcc X-Git-Author: Nathan Sidwell X-Git-Refname: refs/heads/master X-Git-Oldrev: f2da9e26f5c0f04d48872938eff130e2028e75d3 X-Git-Newrev: b1e701dc4adb11a5ed5f45c2fb31ba4689b718d0 Message-Id: <20220105121643.33C93385843B@sourceware.org> Date: Wed, 5 Jan 2022 12:16:43 +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: Wed, 05 Jan 2022 12:16:43 -0000 https://gcc.gnu.org/g:b1e701dc4adb11a5ed5f45c2fb31ba4689b718d0 commit r12-6255-gb1e701dc4adb11a5ed5f45c2fb31ba4689b718d0 Author: Nathan Sidwell Date: Tue Jan 4 13:36:44 2022 -0800 [c++] Adjust mark used member in instantiated class scope The fix for PR97966 caused a regression with (non-template) member functions of template classes. We need to mark them used in the instantiated class's scope, rather than the scope we were in before instantiating, as the latter may itself be in template and change the behaviour of marking a function as used. gcc/cp/ * pt.c (instantiate_class_template_1): Process attribute((used)) set in class's context. gcc/testsuite/ * g++.dg/template/attr-used.C: New. Diff: --- gcc/cp/pt.c | 13 ++++++++----- gcc/testsuite/g++.dg/template/attr-used.C | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c587966adbe..0fa4a162354 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -12277,6 +12277,14 @@ instantiate_class_template_1 (tree type) perform_instantiation_time_access_checks (pattern, args); perform_deferred_access_checks (tf_warning_or_error); + + /* Now that we've gone through all the members, instantiate those + marked with attribute used. We must do this in the context of + the class -- not the context we pushed from, as that might be + inside a template and change the behaviour of mark_used. */ + for (tree x : used) + mark_used (x); + pop_nested_class (); maximum_field_alignment = saved_maximum_field_alignment; if (!fn_context) @@ -12290,11 +12298,6 @@ instantiate_class_template_1 (tree type) if (TYPE_CONTAINS_VPTR_P (type) && CLASSTYPE_KEY_METHOD (type)) vec_safe_push (keyed_classes, type); - /* Now that we've gone through all the members, instantiate those - marked with attribute used. */ - for (tree x : used) - mark_used (x); - return type; } diff --git a/gcc/testsuite/g++.dg/template/attr-used.C b/gcc/testsuite/g++.dg/template/attr-used.C new file mode 100644 index 00000000000..e12bf4caa3f --- /dev/null +++ b/gcc/testsuite/g++.dg/template/attr-used.C @@ -0,0 +1,16 @@ +// { dg-do compile } + +template struct X { + void g () {} + void f () __attribute__((__used__)) {} +}; + +extern X x; // X incomplete here + +template +void Frob (T t) { + x.g(); // X completed here, X::f's body marked for instantiation +} + +// Make sure X::f is emitted +// { dg-final { scan-assembler "_ZN1XIiE1fEv:" } }