diff options
| -rw-r--r-- | gcc/cp/constexpr.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/vla22.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/opt/pr99456.C | 33 |
3 files changed, 36 insertions, 2 deletions
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index c946744..42d00ec 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -6656,7 +6656,8 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t, if (TREE_CODE (t) == CONVERT_EXPR && ARITHMETIC_TYPE_P (type) - && INDIRECT_TYPE_P (TREE_TYPE (op))) + && INDIRECT_TYPE_P (TREE_TYPE (op)) + && ctx->manifestly_const_eval) { if (!ctx->quiet) error_at (loc, diff --git a/gcc/testsuite/g++.dg/ext/vla22.C b/gcc/testsuite/g++.dg/ext/vla22.C index 2308ee7..967adb9 100644 --- a/gcc/testsuite/g++.dg/ext/vla22.C +++ b/gcc/testsuite/g++.dg/ext/vla22.C @@ -6,4 +6,4 @@ void f () { const int tbl[(long) "h"] = { 12 }; // { dg-error "size of array .tbl. is not an integral constant-expression" } -} +} // { dg-warning "narrowing conversion" "" { target c++11 } .-1 } diff --git a/gcc/testsuite/g++.dg/opt/pr99456.C b/gcc/testsuite/g++.dg/opt/pr99456.C new file mode 100644 index 0000000..66f19c8 --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/pr99456.C @@ -0,0 +1,33 @@ +// PR c++/99456 +// { dg-do compile { target c++17 } } +// { dg-options "-g0" } +// { dg-final { scan-assembler-not "PR99456Var0\[1234]" } } +// { dg-final { scan-assembler-not "__static_initialization_and_destruction" } } +// { dg-final { scan-assembler-not "_GLOBAL__sub_I" } } +// { dg-final { scan-assembler-not "_ZGV12PR99456Var1\[1234]" } } + +typedef __UINTPTR_TYPE__ uintptr_t; + +class Container +{ +public: + uintptr_t m; +}; + +extern unsigned desc; +static constexpr unsigned &descRef = desc; + +inline Container PR99456Var01 {reinterpret_cast<uintptr_t> (&descRef)}; +inline Container PR99456Var02 {reinterpret_cast<uintptr_t> (&desc)}; +inline uintptr_t PR99456Var03 {reinterpret_cast<uintptr_t> (&descRef)}; +inline uintptr_t PR99456Var04 {reinterpret_cast<uintptr_t> (&desc)}; + +inline Container PR99456Var11 {reinterpret_cast<uintptr_t> (&descRef)}; +inline Container PR99456Var12 {reinterpret_cast<uintptr_t> (&desc)}; +inline uintptr_t PR99456Var13 {reinterpret_cast<uintptr_t> (&descRef)}; +inline uintptr_t PR99456Var14 {reinterpret_cast<uintptr_t> (&desc)}; + +auto *PR99456Ref11 = &PR99456Var11; +auto *PR99456Ref12 = &PR99456Var12; +auto *PR99456Ref13 = &PR99456Var13; +auto *PR99456Ref14 = &PR99456Var14; |