diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/convert.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/expr/cast10.C | 10 |
4 files changed, 21 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index af8d0e919f6..c7d7b014294 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2009-02-03 Andrew Pinski <andrew_pinski@playstation.sony.com> + + PR C++/36607 + * convert.c (convert_to_integer): Treat OFFSET_TYPE like INTEGER_TYPE. + 2009-02-03 Jakub Jelinek <jakub@redhat.com> * gcc.c (process_command): Update copyright notice dates. diff --git a/gcc/convert.c b/gcc/convert.c index 1a462e7626f..77907bafcb5 100644 --- a/gcc/convert.c +++ b/gcc/convert.c @@ -493,6 +493,7 @@ convert_to_integer (tree type, tree expr) case INTEGER_TYPE: case ENUMERAL_TYPE: case BOOLEAN_TYPE: + case OFFSET_TYPE: /* If this is a logical operation, which just returns 0 or 1, we can change the type of the expression. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 20d0b4adf36..9d50d7fc989 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-02-03 Andrew Pinski <andrew_pinski@playstation.sony.com> + + PR C++/36607 + * g++.dg/expr/cast10.C: New test. + 2009-02-03 Joseph Myers <joseph@codesourcery.com> PR c/35433 diff --git a/gcc/testsuite/g++.dg/expr/cast10.C b/gcc/testsuite/g++.dg/expr/cast10.C new file mode 100644 index 00000000000..cd3e0fc3c27 --- /dev/null +++ b/gcc/testsuite/g++.dg/expr/cast10.C @@ -0,0 +1,10 @@ +// { dg-do compile } +// This used to error out because we would try to convert m to a short. + + +struct a {}; +void b() { + int a::*m; + a *c; + short p = reinterpret_cast<char*>(&(c->*m)) - reinterpret_cast<char*>(c); +} |
