diff options
| author | Jason Merrill <jason@redhat.com> | 2018-01-29 15:56:00 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2018-01-29 15:56:00 -0500 |
| commit | dcbb27dd3f494812c89b530b7dcf06cfad2ff10b (patch) | |
| tree | f1222d8a891ce6f9603dc2865e26bbb939e11429 /gcc/cp/cvt.c | |
| parent | b07c365100c92687361aa062ecf89c49650b8930 (diff) | |
| download | gcc-dcbb27dd3f494812c89b530b7dcf06cfad2ff10b.zip gcc-dcbb27dd3f494812c89b530b7dcf06cfad2ff10b.tar.gz gcc-dcbb27dd3f494812c89b530b7dcf06cfad2ff10b.tar.bz2 | |
PR c++/68810 - wrong location for reinterpret_cast error.
* cvt.c (cp_convert_to_pointer): Always build a CONVERT_EXPR when
!dofold.
From-SVN: r257161
Diffstat (limited to 'gcc/cp/cvt.c')
| -rw-r--r-- | gcc/cp/cvt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 3ab3e2e..f5da08b 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -239,6 +239,11 @@ cp_convert_to_pointer (tree type, tree expr, bool dofold, gcc_assert (GET_MODE_SIZE (SCALAR_INT_TYPE_MODE (TREE_TYPE (expr))) == GET_MODE_SIZE (SCALAR_INT_TYPE_MODE (type))); + /* FIXME needed because convert_to_pointer_maybe_fold still folds + conversion of constants. */ + if (!dofold) + return build1 (CONVERT_EXPR, type, expr); + return convert_to_pointer_maybe_fold (type, expr, dofold); } |