diff options
| author | Jason Merrill <jason@redhat.com> | 2020-04-04 11:45:41 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2020-04-04 16:22:44 -0400 |
| commit | 75c8d6e54a14d090853b998cfd335511b1d8ae5f (patch) | |
| tree | 5928bbca79da2c1886fe3ef0588e42f9f03701ab | |
| parent | 49a86fce1a879a206fb4b27f097910005d968fda (diff) | |
| download | gcc-75c8d6e54a14d090853b998cfd335511b1d8ae5f.zip gcc-75c8d6e54a14d090853b998cfd335511b1d8ae5f.tar.gz gcc-75c8d6e54a14d090853b998cfd335511b1d8ae5f.tar.bz2 | |
c++: Mangling of dependent conversions [PR91377]
We skip over other conversion codes when mangling expressions, we should do
the same with IMPLICIT_CONV_EXPR.
gcc/cp/ChangeLog
2020-04-04 Jason Merrill <jason@redhat.com>
PR c++/91377
* mangle.c (write_expression): Skip IMPLICIT_CONV_EXPR.
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/mangle.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/abi/mangle75.C | 13 |
3 files changed, 19 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 686128a..a382235 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2020-04-04 Jason Merrill <jason@redhat.com> + + PR c++/91377 + * mangle.c (write_expression): Skip IMPLICIT_CONV_EXPR. + 2020-04-04 Patrick Palka <ppalka@redhat.com> PR c++/94205 diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 1fc78bf..9e39cfd 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -2875,6 +2875,7 @@ write_expression (tree expr) /* Skip NOP_EXPR and CONVERT_EXPR. They can occur when (say) a pointer argument is converted (via qualification conversions) to another type. */ while (CONVERT_EXPR_CODE_P (code) + || code == IMPLICIT_CONV_EXPR || location_wrapper_p (expr) /* Parentheses aren't mangled. */ || code == PAREN_EXPR diff --git a/gcc/testsuite/g++.dg/abi/mangle75.C b/gcc/testsuite/g++.dg/abi/mangle75.C new file mode 100644 index 0000000..f266199 --- /dev/null +++ b/gcc/testsuite/g++.dg/abi/mangle75.C @@ -0,0 +1,13 @@ +// PR c++/91377 +// { dg-do compile { target c++11 } } + +struct f { + static constexpr int d = 3; + typedef int e; +}; +template <int a> struct x { }; +template <typename g, g j, g m> using n = x<j + m>; +template <typename ac> auto v() -> n<typename ac::e, 0, ac::d>; +void af() { v<f>(); } + +// { dg-final { scan-assembler "_Z1vI1fE1xIXplLi0EsrT_1dEEv" } } |