https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104470
--- Comment #7 from CVS Commits <cvs-commit at gcc dot gnu.org> --- The master branch has been updated by Jason Merrill <ja...@gcc.gnu.org>: https://gcc.gnu.org/g:a47ab705c2c9f07f08fde499d6be4682efe4b626 commit r13-124-ga47ab705c2c9f07f08fde499d6be4682efe4b626 Author: Jason Merrill <ja...@redhat.com> Date: Tue Apr 26 18:32:51 2022 -0400 c++: alias CTAD refactoring [PR104470] In my previous PR104470 patch I added yet another place that needs to handle dependent member rewriting for deduction guides; this patches centralizes rewriting into maybe_dependent_member_ref. tsubst_baselink still has its own handling because that's simpler than teaching maybe_dependent_member_ref about BASELINKs. PR c++/104470 gcc/cp/ChangeLog: * pt.cc (maybe_dependent_member_ref): Handle types. (tsubst, tsubst_copy): Use it. (tsubst_aggr_type, instantiate_alias_template): Don't handle tf_dguide here.