PR c++/77907 - static init and PMF

* constexpr.c (cxx_eval_constant_expression): Use cp_fold_convert. From-SVN: r242906

PR c++/77907 - static init and PMF
* constexpr.c (cxx_eval_constant_expression): Use cp_fold_convert. From-SVN: r242906
f9438bbb · Jason Merrill · Jason Merrill · c190974f · f9438bbb · f9438bbb
Commit f9438bbb authored Nov 27, 2016 by Jason Merrill Committed by Jason Merrill Nov 27, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

gcc/cp/ChangeLog
+5 -0

gcc/cp/constexpr.c
+1 -1

gcc/testsuite/g++.dg/cpp0x/pr77907.C
+2 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
+2016-11-27  Jason Merrill  <jason@redhat.com>
+
+	PR c++/77907
+	* constexpr.c (cxx_eval_constant_expression): Use cp_fold_convert.
+
 2016-11-24  Martin Liska  <mliska@suse.cz>

 	PR bootstrap/78493

--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -4226,7 +4226,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
 	  {
 	    if (same_type_ignoring_top_level_qualifiers_p (type,
 							   TREE_TYPE (op)))
-	      STRIP_NOPS (t);
+	      return cp_fold_convert (type, op);
 	    else
 	      {
 		if (!ctx->quiet)

--- a/gcc/testsuite/g++.dg/cpp0x/pr77907.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr77907.C
 // PR c++/77907
 // { dg-do run { target c++11 } }
-// { dg-options "-O2" }
+// { dg-options "-O2 -save-temps" }
+// { dg-final { scan-assembler-not "static_initialization" } }

 struct A {
  int foo () { return 1; }