https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68464
--- Comment #5 from Jason Merrill <jason at gcc dot gnu.org> --- Author: jason Date: Mon Dec 7 19:34:11 2015 New Revision: 231381 URL: https://gcc.gnu.org/viewcvs?rev=231381&root=gcc&view=rev Log: PR c++/68464 * cp-gimplify.c (cp_fold): Don't assume X has TREE_TYPE. (cp_genericize): Don't do cp_fold_r here. (cp_fold_function): New. * cp-tree.h: Declare it. * decl.c (finish_function): Call it and the pre-genericize plugin before NRV processing. Modified: trunk/gcc/cp/ChangeLog trunk/gcc/cp/cp-gimplify.c trunk/gcc/cp/cp-tree.h trunk/gcc/cp/decl.c