* cp-gimplify.c (cp_fold): Don't fold constexpr calls if -fno-inline.

From-SVN: r233671

* cp-gimplify.c (cp_fold): Don't fold constexpr calls if -fno-inline.
From-SVN: r233671
28577b86 · Jason Merrill · Jason Merrill · 4501d9ad · 28577b86 · 28577b86
Commit 28577b86 authored Feb 24, 2016 by Jason Merrill Committed by Jason Merrill Feb 24, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletions

gcc/cp/ChangeLog
+4 -0

gcc/cp/cp-gimplify.c
+2 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
+2016-02-24  Jason Merrill  <jason@redhat.com>
+
+	* cp-gimplify.c (cp_fold): Don't fold constexpr calls if -fno-inline.
+
 2016-02-19  Jason Merrill  <jason@redhat.com>

 	PR c++/69743

--- 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;