https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84662
--- Comment #7 from Jakub Jelinek <jakub at gcc dot gnu.org> --- Author: jakub Date: Fri Jun 22 20:28:04 2018 New Revision: 261912 URL: https://gcc.gnu.org/viewcvs?rev=261912&root=gcc&view=rev Log: Backported from mainline 2018-03-02 Jakub Jelinek <ja...@redhat.com> PR c++/84662 * pt.c (tsubst_copy_and_build) <case TEMPLATE_ID_EXPR>: Use RETURN instead of return. <case POINTER_PLUS_EXPR>: Likewise. <case CONVERT_EXPR>: If op0 is error_mark_node, just return it instead of wrapping it into CONVERT_EXPR. * g++.dg/cpp1y/pr84662.C: New test. Added: branches/gcc-7-branch/gcc/testsuite/g++.dg/cpp1y/pr84662.C Modified: branches/gcc-7-branch/gcc/ChangeLog branches/gcc-7-branch/gcc/cp/pt.c branches/gcc-7-branch/gcc/testsuite/ChangeLog