From 1b73c7ef7c9c3c04610bc2d2819affea917d91d2 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 18 Apr 2019 07:40:35 +0000 Subject: [PATCH] tree.c (get_qualified_type): Put found type variants at the head of the variant list. 2019-04-18 Richard Biener * tree.c (get_qualified_type): Put found type variants at the head of the variant list. From-SVN: r270437 --- gcc/ChangeLog | 5 +++++ gcc/tree.c | 21 ++++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3b8a84a5163..c8100e2d187 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-04-18 Richard Biener + + * tree.c (get_qualified_type): Put found type variants at the + head of the variant list. + 2018-04-17 Segher Boessenkool * config/rs6000/rs6000.c (rs6000_register_move_cost): Fix typo. diff --git a/gcc/tree.c b/gcc/tree.c index a483cc1f225..73102c4e75b 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -6451,17 +6451,28 @@ check_aligned_type (const_tree cand, const_tree base, unsigned int align) tree get_qualified_type (tree type, int type_quals) { - tree t; - if (TYPE_QUALS (type) == type_quals) return type; + tree mv = TYPE_MAIN_VARIANT (type); + if (check_qualified_type (mv, type, type_quals)) + return mv; + /* Search the chain of variants to see if there is already one there just like the one we need to have. If so, use that existing one. We must preserve the TYPE_NAME, since there is code that depends on this. */ - for (t = TYPE_MAIN_VARIANT (type); t; t = TYPE_NEXT_VARIANT (t)) - if (check_qualified_type (t, type, type_quals)) - return t; + for (tree *tp = &TYPE_NEXT_VARIANT (mv); *tp; tp = &TYPE_NEXT_VARIANT (*tp)) + if (check_qualified_type (*tp, type, type_quals)) + { + /* Put the found variant at the head of the variant list so + frequently searched variants get found faster. The C++ FE + benefits greatly from this. */ + tree t = *tp; + *tp = TYPE_NEXT_VARIANT (t); + TYPE_NEXT_VARIANT (t) = TYPE_NEXT_VARIANT (mv); + TYPE_NEXT_VARIANT (mv) = t; + return t; + } return NULL_TREE; } -- 2.30.2