OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/55513 (Incorrect snprintf folding when building with -std=c++0x) 

PR c++/55513
	* semantics.c (cxx_eval_builtin_function_call): Set non_constant_p
	after folding.

From-SVN: r194316
This commit is contained in:
Aldy Hernandez 2012-12-08 01:19:13 +00:00 committed by Aldy Hernandez
parent cea55d343c
commit 3da2b176b3
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2012-12-07 Aldy Hernandez <aldyh@redhat.com>
PR c++/55513
* semantics.c (cxx_eval_builtin_function_call): Set non_constant_p
after folding.
2012-12-07 Paolo Carlini <paolo.carlini@oracle.com>
* tree.c (build_aggr_init_expr): Remove tsubst_flags_t parameter.

16
gcc/cp/semantics.c
View File

@ -45,6 +45,13 @@ along with GCC; see the file COPYING3. If not see
#include "bitmap.h"
#include "hash-table.h"
static bool verify_constant (tree, bool, bool *, bool *);
#define VERIFY_CONSTANT(X) \
do { \
if (verify_constant ((X), allow_non_constant, non_constant_p, overflow_p)) \
return t; \
} while (0)
/* There routines provide a modular interface to perform many parsing
operations. They may therefore be used during actual parsing, or
during template instantiation, which may be regarded as a
@ -6437,7 +6444,9 @@ cxx_eval_builtin_function_call (const constexpr_call *call, tree t,
return t;
new_call = build_call_array_loc (EXPR_LOCATION (t), TREE_TYPE (t),
CALL_EXPR_FN (t), nargs, args);
return fold (new_call);
new_call = fold (new_call);
VERIFY_CONSTANT (new_call);
return new_call;
}
/* TEMP is the constant value of a temporary object of type TYPE. Adjust
@ -6738,11 +6747,6 @@ verify_constant (tree t, bool allow_non_constant, bool *non_constant_p,
}
return *non_constant_p;
}
#define VERIFY_CONSTANT(X) \
do { \
if (verify_constant ((X), allow_non_constant, non_constant_p, overflow_p)) \
return t; \
} while (0)
/* Subroutine of cxx_eval_constant_expression.
Attempt to reduce the unary expression tree T to a compile time value.

12
gcc/testsuite/g++.dg/pr55513.C Normal file
View File

@ -0,0 +1,12 @@
// { dg-do compile }
// { dg-options "-O0 -fdump-tree-gimple" }
main ()
{
char s[10];
const int t = (__builtin_memcpy (s, "Hello", 6), 777);
__builtin_printf ("%d %s\n", t, s);
}
// { dg-final { scan-tree-dump-times "memcpy" 1 "gimple" } }
// { dg-final { cleanup-tree-dump "gimple" } }