diff options
| author | Jason Merrill <jason@redhat.com> | 2018-03-02 11:54:23 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2018-03-02 11:54:23 -0500 |
| commit | e76feb5b6969156e627d33cfd9d4524dba98a630 (patch) | |
| tree | 558119530f59c2da0866d0cff76457ced5c4d148 | |
| parent | 70614cb9031227aa3402192bdfa7b9d28ed0f0d6 (diff) | |
| download | gcc-e76feb5b6969156e627d33cfd9d4524dba98a630.zip gcc-e76feb5b6969156e627d33cfd9d4524dba98a630.tar.gz gcc-e76feb5b6969156e627d33cfd9d4524dba98a630.tar.bz2 | |
Fix MIPS16 ICE.
* pt.c (type_dependent_expression_p): Check DECL_LANG_SPECIFIC.
From-SVN: r258143
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 |
2 files changed, 7 insertions, 1 deletions
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 <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 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)) |