From e76feb5b6969156e627d33cfd9d4524dba98a630 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 2 Mar 2018 11:54:23 -0500 Subject: [PATCH] Fix MIPS16 ICE. * pt.c (type_dependent_expression_p): Check DECL_LANG_SPECIFIC. From-SVN: r258143 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c74d3bc3e7a..9986b88489a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2018-03-02 Jason Merrill + + Fix MIPS16 ICE. + * pt.c (type_dependent_expression_p): Check DECL_LANG_SPECIFIC. + 2018-03-02 Marek Polacek PR c++/84590 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index e07d77bb87e..f67080fc279 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -24641,7 +24641,8 @@ type_dependent_expression_p (tree expression) if (TREE_CODE (expression) == FUNCTION_DECL && !(DECL_CLASS_SCOPE_P (expression) && dependent_type_p (DECL_CONTEXT (expression))) - && !(DECL_FRIEND_P (expression) + && !(DECL_LANG_SPECIFIC (expression) + && DECL_FRIEND_P (expression) && (!DECL_FRIEND_CONTEXT (expression) || dependent_type_p (DECL_FRIEND_CONTEXT (expression)))) && !DECL_LOCAL_FUNCTION_P (expression)) -- 2.30.2