diff options
| author | Jason Merrill <jason@redhat.com> | 2018-04-26 16:32:32 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2018-04-26 16:32:32 -0400 |
| commit | 128d29a52fcd9097c1e809c675dadd108f8dd604 (patch) | |
| tree | afc670f671f43840fee313a0d13f1afbe9eed3a9 /gcc/cp/cvt.c | |
| parent | e94497fbc0cddc5fdb5447967ee5a0e9634d00b0 (diff) | |
| download | gcc-128d29a52fcd9097c1e809c675dadd108f8dd604.zip gcc-128d29a52fcd9097c1e809c675dadd108f8dd604.tar.gz gcc-128d29a52fcd9097c1e809c675dadd108f8dd604.tar.bz2 | |
PR c++/85545 - ICE with noexcept PMF conversion.
* cvt.c (cp_fold_convert): Handle PMF CONSTRUCTORs directly.
From-SVN: r259689
Diffstat (limited to 'gcc/cp/cvt.c')
| -rw-r--r-- | gcc/cp/cvt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 9b53fa3..a3735a1 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -601,7 +601,9 @@ cp_fold_convert (tree type, tree expr) tree conv; if (TREE_TYPE (expr) == type) conv = expr; - else if (TREE_CODE (expr) == PTRMEM_CST) + else if (TREE_CODE (expr) == PTRMEM_CST + || (TREE_CODE (expr) == CONSTRUCTOR + && TYPE_PTRMEMFUNC_P (type))) { /* Avoid wrapping a PTRMEM_CST in NOP_EXPR. */ conv = copy_node (expr); |