diff options
| author | Jason Merrill <jason@redhat.com> | 2008-01-27 21:19:38 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2008-01-27 21:19:38 -0500 |
| commit | 7a0b47e3feb24e19feac3a404bffc01e65cce195 (patch) | |
| tree | 98c5fb24fb3e291e44cfd8a516911e0197643bf8 | |
| parent | ba54d89dc64da0d857ef99607d114df7dad30a17 (diff) | |
| download | gcc-7a0b47e3feb24e19feac3a404bffc01e65cce195.zip gcc-7a0b47e3feb24e19feac3a404bffc01e65cce195.tar.gz gcc-7a0b47e3feb24e19feac3a404bffc01e65cce195.tar.bz2 | |
re PR c++/27177 (ICE in build_simple_base_path, at cp/class.c:474)
PR c++/27177
* class.c (build_base_path): Fix previous change.
From-SVN: r131899
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/class.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 714f65b..118d25d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2008-01-27 Jason Merrill <jason@redhat.com> + + PR c++/27177 + * class.c (build_base_path): Fix previous change. + 2008-01-26 Jakub Jelinek <jakub@redhat.com> PR c++/34965 diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 6b76bf7..0ce4ba4 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -291,8 +291,12 @@ build_base_path (enum tree_code code, target_type = code == PLUS_EXPR ? BINFO_TYPE (binfo) : BINFO_TYPE (d_binfo); /* Do we need to look in the vtable for the real offset? */ - /* Don't bother inside sizeof; the source type might not be complete. */ - virtual_access = (v_binfo && fixed_type_p <= 0) && !skip_evaluation; + virtual_access = (v_binfo && fixed_type_p <= 0); + + /* Don't bother with the calculations inside sizeof; they'll ICE if the + source type is incomplete and the pointer value doesn't matter. */ + if (skip_evaluation) + return build_nop (build_pointer_type (target_type), expr); /* Do we need to check for a null pointer? */ if (want_pointer && !nonnull) |