diff options
| author | Jason Merrill <jason@redhat.com> | 2009-09-30 11:49:17 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-09-30 11:49:17 -0400 |
| commit | bfd6b23c4f733584abc55de79b10d575fc87152d (patch) | |
| tree | 8b9d379a1bf80b82dba0b2e7117f1f18992fe452 | |
| parent | 53a51cef4c965ba77f4d0ad2f8242b01cda44a3e (diff) | |
| download | gcc-bfd6b23c4f733584abc55de79b10d575fc87152d.zip gcc-bfd6b23c4f733584abc55de79b10d575fc87152d.tar.gz gcc-bfd6b23c4f733584abc55de79b10d575fc87152d.tar.bz2 | |
* cp-tree.h (LANG_DECL_U2_CHECK): Check LANG_DECL_HAS_MIN.
From-SVN: r152329
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 44c196d..03cbb28 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +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> diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 0487a9f..4c2441c 100644 --- 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__); \ <->u.min.u2; }) |