On Sun, Sep 15, 2019 at 10:18:29AM -0400, Jason Merrill wrote: > On 9/5/19 9:24 PM, Marek Polacek wrote: > > They use > > non_lvalue_loc, but that won't create a NON_LVALUE_EXPR wrapper around a > > location > > wrapper. > > That seems like the bug. maybe_lvalue_p should be true for > VIEW_CONVERT_EXPR.
That makes sense but it breaks in tsubst_* which doesn't expect a NON_LVALUE_EXPR wrapped around a location wrapper. Perhaps we want to handle it like this. Bootstrapped/regtested on x86_64-linux, ok for trunk? 2019-09-16 Marek Polacek <pola...@redhat.com> PR c++/91678 - wrong error with decltype and location wrapper. * pt.c (tsubst_copy): Handle NON_LVALUE_EXPRs wrapped around a location wrapper. * fold-const.c (maybe_lvalue_p): Handle VIEW_CONVERT_EXPR. * g++.dg/cpp0x/decltype73.C: New test. diff --git gcc/cp/pt.c gcc/cp/pt.c index 9de1b8fec97..4bd77ac2578 100644 --- gcc/cp/pt.c +++ gcc/cp/pt.c @@ -15786,8 +15786,16 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl) return op; } } - /* We shouldn't see any other uses of these in templates. */ - gcc_unreachable (); + /* We can get a NON_LVALUE_EXPR wrapped around a location wrapper. */ + else if (code == NON_LVALUE_EXPR && location_wrapper_p (op)) + { + tree type = tsubst (TREE_TYPE (t), args, complain, in_decl); + op = tsubst_copy (TREE_OPERAND (t, 0), args, complain, in_decl); + return build1 (code, type, op); + } + else + /* We shouldn't see any other uses of these in templates. */ + gcc_unreachable (); } case CAST_EXPR: diff --git gcc/fold-const.c gcc/fold-const.c index a99dafec589..6d955a76f87 100644 --- gcc/fold-const.c +++ gcc/fold-const.c @@ -2594,6 +2594,7 @@ maybe_lvalue_p (const_tree x) case TARGET_EXPR: case COND_EXPR: case BIND_EXPR: + case VIEW_CONVERT_EXPR: break; default: diff --git gcc/testsuite/g++.dg/cpp0x/decltype73.C gcc/testsuite/g++.dg/cpp0x/decltype73.C new file mode 100644 index 00000000000..cbe94a898e3 --- /dev/null +++ gcc/testsuite/g++.dg/cpp0x/decltype73.C @@ -0,0 +1,4 @@ +// PR c++/91678 - wrong error with decltype and location wrapper. +// { dg-do compile { target c++11 } } + +float* test(float* c) { return (decltype(c + 0))(float*)c; }