From: Jason Merrill Date: Fri, 2 Mar 2018 16:54:23 +0000 (-0500) Subject: Fix MIPS16 ICE. X-Git-Tag: upstream/12.2.0~33081 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e76feb5b6969156e627d33cfd9d4524dba98a630;p=platform%2Fupstream%2Fgcc.git Fix MIPS16 ICE. * pt.c (type_dependent_expression_p): Check DECL_LANG_SPECIFIC. From-SVN: r258143 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c74d3bc..9986b88 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 e07d77b..f67080f 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))