* cp-tree.h (LANG_DECL_U2_CHECK): Check LANG_DECL_HAS_MIN.

From-SVN: r152329

* cp-tree.h (LANG_DECL_U2_CHECK): Check LANG_DECL_HAS_MIN.
From-SVN: r152329
bfd6b23c · Jason Merrill · Jason Merrill · 53a51cef · bfd6b23c · bfd6b23c
Commit bfd6b23c authored Sep 30, 2009 by Jason Merrill Committed by Jason Merrill Sep 30, 2009
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletions

gcc/cp/ChangeLog
+4 -0

gcc/cp/cp-tree.h
+1 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
+2009-09-30  Jason Merrill  <jason@redhat.com>
+
+	* cp-tree.h (LANG_DECL_U2_CHECK): Check LANG_DECL_HAS_MIN.
+
 2009-09-29  John Freeman  <jfreeman08@gmail.com>
 	    Jason Merrill  <jason@redhat.com>


--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1838,7 +1838,7 @@ struct GTY(()) lang_decl {

 #define LANG_DECL_U2_CHECK(NODE, TF) __extension__		\
 ({  struct lang_decl *lt = DECL_LANG_SPECIFIC (NODE);		\
-    if (lt->u.base.u2sel != TF)					\
+    if (!LANG_DECL_HAS_MIN (NODE) || lt->u.base.u2sel != TF)	\
      lang_check_failed (__FILE__, __LINE__, __FUNCTION__);	\
    &lt->u.min.u2; })