diff options
| -rw-r--r-- | gcc/cp/constexpr.cc | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/constexpr-dynamic19.C | 10 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/constexpr-dynamic1a.C | 6 |
3 files changed, 21 insertions, 1 deletions
diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc index be24ae2..142579a 100644 --- a/gcc/cp/constexpr.cc +++ b/gcc/cp/constexpr.cc @@ -3240,7 +3240,11 @@ cxx_dynamic_cast_fn_p (tree fndecl) { return (cxx_dialect >= cxx20 && id_equal (DECL_NAME (fndecl), "__dynamic_cast") - && CP_DECL_CONTEXT (fndecl) == abi_node); + && CP_DECL_CONTEXT (fndecl) == abi_node + /* Only consider implementation-detail __dynamic_cast calls that + correspond to a dynamic_cast, and ignore direct calls to + abi::__dynamic_cast. */ + && DECL_ARTIFICIAL (fndecl)); } /* Often, we have an expression in the form of address + offset, e.g. diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-dynamic19.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-dynamic19.C new file mode 100644 index 0000000..27d167c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-dynamic19.C @@ -0,0 +1,10 @@ +// PR c++/120620 +// { dg-do compile } + +#include <cxxabi.h> + +struct A* a; + +void f() { + void* const p = abi::__dynamic_cast(&a, 0, 0, 42); +} diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-dynamic1a.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-dynamic1a.C new file mode 100644 index 0000000..4077a47 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-dynamic1a.C @@ -0,0 +1,6 @@ +// Test that including <cxxabi.h>, whence the actual abi:__dynamic_cast +// is declared, doesn't affect our constexpr dynamic_cast handling. +// { dg-do compile { target c++20 } } + +#include <cxxabi.h> +#include "constexpr-dynamic1.C" |