diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-04-03 07:43:46 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-04-03 07:43:46 +0000 |
| commit | f23ce5f0f2a57dab072970903959367a5f62f535 (patch) | |
| tree | 05c057f129b8e304ff878651261f0fb4016c5d77 /gcc/cp | |
| parent | 6fb2153aa6d3fcd61853d07a9161b7e00be471d2 (diff) | |
| download | gcc-f23ce5f0f2a57dab072970903959367a5f62f535.tar.gz | |
PR c++/35741
* semantics.c (finish_offsetof): Undo effect of convert_from_reference
before calling fold_offsetof.
* g++.dg/other/offsetof5.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@133863 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c7600ecb0e2..713b62e6e0a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2008-04-03 Jakub Jelinek <jakub@redhat.com> + + PR c++/35741 + * semantics.c (finish_offsetof): Undo effect of convert_from_reference + before calling fold_offsetof. + 2008-04-03 Tom Tromey <tromey@redhat.com> * Make-lang.in (c++_OBJS): New variable. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 8966bf5d921..95ebde69a8d 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -3039,6 +3039,8 @@ finish_offsetof (tree expr) error ("cannot apply %<offsetof%> to member function %qD", expr); return error_mark_node; } + if (TREE_CODE (expr) == INDIRECT_REF && REFERENCE_REF_P (expr)) + expr = TREE_OPERAND (expr, 0); return fold_offsetof (expr, NULL_TREE); } |