c++: class hotness attribute and member template

The FUNCTION_DECL check ignored member function templates.

gcc/cp/ChangeLog:

	* class.cc (propagate_class_warmth_attribute): Handle
	member templates.

gcc/testsuite/ChangeLog:

	* g++.dg/ext/attr-hotness.C: Add member templates.

Co-authored-by: Jason Xu <rxu@DRWHoldings.com>
This commit is contained in:
Jason Merrill 2023-12-12 14:41:39 -05:00
parent 8501edba91
commit b756830399
2 changed files with 14 additions and 6 deletions

View file

@ -7805,8 +7805,8 @@ propagate_class_warmth_attribute (tree t)
if (class_has_cold_attr || class_has_hot_attr)
for (tree f = TYPE_FIELDS (t); f; f = DECL_CHAIN (f))
if (TREE_CODE (f) == FUNCTION_DECL)
maybe_propagate_warmth_attributes (f, t);
if (DECL_DECLARES_FUNCTION_P (f))
maybe_propagate_warmth_attributes (STRIP_TEMPLATE (f), t);
}
tree

View file

@ -2,15 +2,23 @@
/* { dg-options "-O0 -Wattributes -fdump-tree-gimple" } */
struct __attribute((cold)) A { __attribute((noinline, used)) void foo(void) { } };
struct __attribute((cold)) A {
__attribute((noinline, used)) void foo(void) { }
template <class T> void bar() {}
};
template void A::bar<int>();
struct __attribute((hot)) B { __attribute((noinline, used)) void foo(void) { } };
struct __attribute((hot)) B {
__attribute((noinline, used)) void foo(void) { }
template <class T> void bar() {}
};
template void B::bar<int>();
struct __attribute((hot, cold)) C { __attribute((noinline, used)) void foo(void) { } }; /* { dg-warning "ignoring attribute .cold. because it conflicts with attribute .hot." } */
struct __attribute((cold, hot)) D { __attribute((noinline, used)) void foo(void) { } }; /* { dg-warning "ignoring attribute .hot. because it conflicts with attribute .cold." } */
/* { dg-final { scan-tree-dump-times "cold" 2 "gimple" } } */
/* { dg-final { scan-tree-dump-times "hot" 2 "gimple" } } */
/* { dg-final { scan-tree-dump-times "cold" 3 "gimple" } } */
/* { dg-final { scan-tree-dump-times "hot" 3 "gimple" } } */