https://gcc.gnu.org/g:8d70737492a5bdec41c6ae2c351c6882896b16b1
commit r14-11680-g8d70737492a5bdec41c6ae2c351c6882896b16b1 Author: Jason Merrill <ja...@redhat.com> Date: Wed Apr 16 12:02:58 2025 -0400 c++: templates, attributes, #pragma target [PR114772] Since r12-5426 apply_late_template_attributes suppresses various global state to avoid applying active pragmas to earlier declarations; we also need to override target_option_current_node. PR c++/114772 PR c++/101180 gcc/cp/ChangeLog: * pt.cc (apply_late_template_attributes): Also override target_option_current_node. gcc/testsuite/ChangeLog: * g++.dg/ext/pragma-target2.C: New test. (cherry picked from commit 5fdb0145fb9499f5db9e27f775895ce4a39215e4) Diff: --- gcc/cp/pt.cc | 2 ++ gcc/testsuite/g++.dg/ext/pragma-target2.C | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index a4028a545a33..26b9df941795 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -12245,6 +12245,8 @@ apply_late_template_attributes (tree *decl_p, tree attributes, int attr_flags, auto o4 = make_temp_override (scope_chain->omp_declare_target_attribute, NULL); auto o5 = make_temp_override (scope_chain->omp_begin_assumes, NULL); + auto o6 = make_temp_override (target_option_current_node, + target_option_default_node); cplus_decl_attributes (decl_p, late_attrs, attr_flags); diff --git a/gcc/testsuite/g++.dg/ext/pragma-target2.C b/gcc/testsuite/g++.dg/ext/pragma-target2.C new file mode 100644 index 000000000000..53eb7dd96a2b --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/pragma-target2.C @@ -0,0 +1,18 @@ +// PR c++/114772 +// { dg-do compile { target x86_64-*-* } } + +template<typename V, bool STREAMING> +inline __attribute__((always_inline)) +__attribute__((warn_unused_result)) +int walk_document(V visitor) {return 0;} + +template<bool STREAMING> +void parse_document() { + int r = walk_document<bool, STREAMING>(false); +} + +void stage2_next() { + parse_document<true>(); +} + +#pragma GCC target("pclmul")