On Wed, Mar 7, 2018 at 5:04 PM, Jakub Jelinek <ja...@redhat.com> wrote: > - /* Don't fold __builtin_constant_p within a constexpr function. */ > - bool bi_const_p = (DECL_FUNCTION_CODE (fun) == BUILT_IN_CONSTANT_P); > + /* Don't fold __builtin_{,early_}constant_p within a constexpr function. > */ > + bool bi_const_p > + = (DECL_FUNCTION_CODE (fun) == BUILT_IN_CONSTANT_P > + || DECL_FUNCTION_CODE (fun) == BUILT_IN_EARLY_CONSTANT_P);
Let's use DECL_IS_BUILTIN_CONSTANT_P here. With that change the C++ bits are OK. Jason