aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2016-11-20 23:41:21 -0500
committerJason Merrill <jason@gcc.gnu.org>2016-11-20 23:41:21 -0500
commit29c90a3c28a7917023477648f0c88aa273e7510e (patch)
treef96f5d7c6ddd277da432d34ddf9527d6e7ee5fbd
parent3082005070fbba0714daabaa4998e42cc2f55773 (diff)
downloadgcc-29c90a3c28a7917023477648f0c88aa273e7510e.zip
gcc-29c90a3c28a7917023477648f0c88aa273e7510e.tar.gz
gcc-29c90a3c28a7917023477648f0c88aa273e7510e.tar.bz2
PR objc++/78418 - ICE in string tests on darwin
* tree.c (lvalue_kind): Guard DECL_HAS_VALUE_EXPR_P. From-SVN: r242647
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/tree.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c26f145..ea07438 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-18 Jason Merrill <jason@redhat.com>
+
+ PR objc++/78418 - ICE in string tests on darwin
+ * tree.c (lvalue_kind): Guard DECL_HAS_VALUE_EXPR_P.
+
2016-11-18 Jakub Jelinek <jakub@redhat.com>
PR c++/77285
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index d1dd7c4..9ded9f2 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -142,7 +142,7 @@ lvalue_kind (const_tree ref)
return clk_none;
/* FALLTHRU */
case VAR_DECL:
- if (DECL_HAS_VALUE_EXPR_P (ref))
+ if (VAR_P (ref) && DECL_HAS_VALUE_EXPR_P (ref))
return lvalue_kind (DECL_VALUE_EXPR (CONST_CAST_TREE (ref)));
if (TREE_READONLY (ref) && ! TREE_STATIC (ref)