aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/pt.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2011-06-16 18:09:05 -0400
committerJason Merrill <jason@gcc.gnu.org>2011-06-16 18:09:05 -0400
commit42db600dba6adb352854e1eeb909fc3e7a2d892a (patch)
tree1c49dd0ed0225bd75e52939828942e8090467921 /gcc/cp/pt.c
parent80390766bd24c78c10fe3a328a82a233ef46c7cb (diff)
downloadgcc-42db600dba6adb352854e1eeb909fc3e7a2d892a.zip
gcc-42db600dba6adb352854e1eeb909fc3e7a2d892a.tar.gz
gcc-42db600dba6adb352854e1eeb909fc3e7a2d892a.tar.bz2
re PR c++/49229 ([C++0x][SFINAE] ICE with variadics and depending non-type default parameter)
PR c++/49229 * pt.c (tsubst_decl) [FUNCTION_DECL]: Handle substitution failure. From-SVN: r175120
Diffstat (limited to 'gcc/cp/pt.c')
-rw-r--r--gcc/cp/pt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index ff145a26..1008b3b 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9548,6 +9548,8 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain)
(DECL_TEMPLATE_RESULT
(DECL_TI_TEMPLATE (t))),
args, complain, in_decl);
+ if (argvec == error_mark_node)
+ RETURN (error_mark_node);
/* Check to see if we already have this specialization. */
hash = hash_tmpl_and_args (gen_tmpl, argvec);