diff options
| author | Jason Merrill <jason@redhat.com> | 2016-02-24 10:17:58 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2016-02-24 10:17:58 -0500 |
| commit | 28577b86833bdb2e5241790f233fd2503ab4f880 (patch) | |
| tree | 73ac8cea7f52f33326e86d043c861466c827d7a4 /gcc/cp | |
| parent | 4501d9ad44510a07e5f07439275b39198268cf47 (diff) | |
| download | gcc-28577b86833bdb2e5241790f233fd2503ab4f880.zip gcc-28577b86833bdb2e5241790f233fd2503ab4f880.tar.gz gcc-28577b86833bdb2e5241790f233fd2503ab4f880.tar.bz2 | |
* cp-gimplify.c (cp_fold): Don't fold constexpr calls if -fno-inline.
From-SVN: r233671
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ca3b14b..582fd07 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +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 diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 34bdc82..c59cd90 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; |