From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 2 Mar 2018 16:54:23 +0000 (+0000)
Subject: 	Fix MIPS16 ICE.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd6f00144edc8c5f05bf9413eaa875f5b64e96c9;p=thirdparty%2Fgcc.git

	Fix MIPS16 ICE.

	* pt.c (type_dependent_expression_p): Check DECL_LANG_SPECIFIC.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@258143 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c74d3bc3e7a8..9986b88489a1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-02  Jason Merrill  <jason@redhat.com>
+
+	Fix MIPS16 ICE.
+	* pt.c (type_dependent_expression_p): Check DECL_LANG_SPECIFIC.
+
 2018-03-02  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/84590
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index e07d77bb87ed..f67080fc2793 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))