From 29684344593e5532a8c3c19d1bc8cc165ca8ec4f Mon Sep 17 00:00:00 2001 From: jason Date: Wed, 24 Feb 2016 15:17:58 +0000 Subject: [PATCH] * cp-gimplify.c (cp_fold): Don't fold constexpr calls if -fno-inline. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233671 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/cp-gimplify.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ca3b14bff1fc..582fd076189d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2016-02-24 Jason Merrill + + * cp-gimplify.c (cp_fold): Don't fold constexpr calls if -fno-inline. + 2016-02-19 Jason Merrill PR c++/69743 diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 34bdc827432e..c59cd90063e4 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -2154,7 +2154,8 @@ cp_fold (tree x) TODO: Do constexpr expansion of expressions where the call itself is not constant, but the call followed by an INDIRECT_REF is. */ - if (callee && DECL_DECLARED_CONSTEXPR_P (callee)) + if (callee && DECL_DECLARED_CONSTEXPR_P (callee) + && !flag_no_inline) r = maybe_constant_value (x); optimize = sv; -- 2.47.3