diff options
| author | Jason Merrill <jason@redhat.com> | 2010-01-20 20:58:53 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-01-20 20:58:53 -0500 |
| commit | 4d43dcdeb57d58ad5e3aade44b93fa48d051c770 (patch) | |
| tree | 7f36d32b649117c432fd4d50913d0ac71b47d393 /gcc | |
| parent | f827f65933319275c46eccf2aa1df4f1d21d6783 (diff) | |
| download | gcc-4d43dcdeb57d58ad5e3aade44b93fa48d051c770.zip gcc-4d43dcdeb57d58ad5e3aade44b93fa48d051c770.tar.gz gcc-4d43dcdeb57d58ad5e3aade44b93fa48d051c770.tar.bz2 | |
re PR c++/42338 ([c++0x] ICE on decltype usage with templates)
PR c++/42338
* mangle.c (write_expression): Handle tree codes that have extra
arguments in the middle-end.
* cp-demangle.c (d_print_comp): Fix array index printing.
From-SVN: r156103
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/mangle.c | 24 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/abi/mangle39.C | 28 |
3 files changed, 56 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5f7190e..a6a3eb2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2010-01-20 Jason Merrill <jason@redhat.com> + + PR c++/42338 + * mangle.c (write_expression): Handle tree codes that have extra + arguments in the middle-end. + 2010-01-20 Paolo Carlini <paolo.carlini@oracle.com> PR c++/42038 diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 13b0ed4..7e4cf66 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -2481,7 +2481,7 @@ write_expression (tree expr) } else { - int i; + int i, len; const char *name; /* When we bind a variable or function to a non-type template @@ -2582,7 +2582,27 @@ write_expression (tree expr) break; default: - for (i = 0; i < TREE_OPERAND_LENGTH (expr); ++i) + /* In the middle-end, some expressions have more operands than + they do in templates (and mangling). */ + switch (code) + { + case PREINCREMENT_EXPR: + case PREDECREMENT_EXPR: + case POSTINCREMENT_EXPR: + case POSTDECREMENT_EXPR: + len = 1; + break; + + case ARRAY_REF: + len = 2; + break; + + default: + len = TREE_OPERAND_LENGTH (expr); + break; + } + + for (i = 0; i < len; ++i) { tree operand = TREE_OPERAND (expr, i); /* As a GNU extension, the middle operand of a diff --git a/gcc/testsuite/g++.dg/abi/mangle39.C b/gcc/testsuite/g++.dg/abi/mangle39.C new file mode 100644 index 0000000..30a08b0 --- /dev/null +++ b/gcc/testsuite/g++.dg/abi/mangle39.C @@ -0,0 +1,28 @@ +// PR c++/42338 +// { dg-options "-std=c++0x" } +// { dg-final { scan-assembler "_Z1fIPiEDTcmppfp_Li0EET_" } } +// { dg-final { scan-assembler "_Z1gIiEvRK1AIT_EDTixfp_Li0EE" } } + +template<typename T> +auto f(T t) -> decltype(++t, 0) +{ + ++t; + return 0; +} + +template <class T> +struct A +{ + T operator[](int) const { return 0; } +}; + +template< typename T > +void g(const A<T> &a, decltype(a[0]) t) { } + +int main() +{ + f((int*)0); + + A<int> a; + g(a,1); +} |