diff mbox series

[pushed] c++: speed up looking up the current class

Message ID 20210612045858.1544797-1-jason@redhat.com
State Accepted
Headers show
Series [pushed] c++: speed up looking up the current class | expand

Commit Message

Jason Merrill June 12, 2021, 4:58 a.m. UTC 
While looking at template instantiation tracing, I noticed that we were
frequently looking up a particular class template instance while
instantiating it.  This patch shortcuts that lookup, and speeds up compiling
stdc++.h with my (checking/unoptimized) compiler by about 3%.

Tested x86_64-pc-linux-gnu, applying to trunk.

gcc/cp/ChangeLog:

	* pt.c (lookup_template_class_1): Shortcut current_class_type.
---
 gcc/cp/pt.c | 7 +++++++
 1 file changed, 7 insertions(+)


base-commit: f16f65f8364b5bf23c72a8fdbba4974ecadc5cb6
diff mbox series

Patch

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 141388ad2e5..d4bb5cc5eaf 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9833,6 +9833,13 @@  lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context,
       /* From here on, we're only interested in the most general
 	 template.  */
 
+      /* Shortcut looking up the current class scope again.  */
+      if (current_class_type)
+	if (tree ti = CLASSTYPE_TEMPLATE_INFO (current_class_type))
+	  if (gen_tmpl == most_general_template (TI_TEMPLATE (ti))
+	      && comp_template_args (arglist, TI_ARGS (ti)))
+	    return current_class_type;
+
       /* Calculate the BOUND_ARGS.  These will be the args that are
 	 actually tsubst'd into the definition to create the
 	 instantiation.  */