diff options
| author | Jason Merrill <jason@redhat.com> | 2018-04-27 11:00:53 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2018-04-27 11:00:53 -0400 |
| commit | 6d0e87b25ee21493d4f47bb39aee3e2d33cb08d9 (patch) | |
| tree | df50d3a40a9ba75887fd0d79d59d06b3940f8dc9 /gcc/cp/cvt.c | |
| parent | 4bdc2738ce61b5f380930f670709ed9e9cd7cf2a (diff) | |
| download | gcc-6d0e87b25ee21493d4f47bb39aee3e2d33cb08d9.zip gcc-6d0e87b25ee21493d4f47bb39aee3e2d33cb08d9.tar.gz gcc-6d0e87b25ee21493d4f47bb39aee3e2d33cb08d9.tar.bz2 | |
PR c++/85545 - ICE with noexcept PMF conversion.
* cvt.c (cp_fold_convert): Pass PMF CONSTRUCTORs to
build_ptrmemfunc.
* typeck.c (build_ptrmemfunc): Don't build a NOP_EXPR for zero
adjustment.
(build_ptrmemfunc_access_expr): Special-case CONSTRUCTORs.
From-SVN: r259712
Diffstat (limited to 'gcc/cp/cvt.c')
| -rw-r--r-- | gcc/cp/cvt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index a3735a1..0f045e2 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -601,14 +601,16 @@ cp_fold_convert (tree type, tree expr) tree conv; if (TREE_TYPE (expr) == type) conv = expr; - else if (TREE_CODE (expr) == PTRMEM_CST - || (TREE_CODE (expr) == CONSTRUCTOR - && TYPE_PTRMEMFUNC_P (type))) + else if (TREE_CODE (expr) == PTRMEM_CST) { /* Avoid wrapping a PTRMEM_CST in NOP_EXPR. */ conv = copy_node (expr); TREE_TYPE (conv) = type; } + else if (TREE_CODE (expr) == CONSTRUCTOR + && TYPE_PTRMEMFUNC_P (type)) + conv = build_ptrmemfunc (TYPE_PTRMEMFUNC_FN_TYPE (type), expr, + true, false, tf_warning_or_error); else { conv = fold_convert (type, expr); |