Commit ce209777 by Jakub Jelinek Committed by Jakub Jelinek

tree.c (builtin_valid_in_constant_expr_p): Test for DECL_BUILT_IN_CLASS equal to…

tree.c (builtin_valid_in_constant_expr_p): Test for DECL_BUILT_IN_CLASS equal to BUILT_IN_NORMAL instead of just DECL_BUILT_IN.

	* tree.c (builtin_valid_in_constant_expr_p): Test for
	DECL_BUILT_IN_CLASS equal to BUILT_IN_NORMAL instead of just
	DECL_BUILT_IN.
	(bot_manip): Likewise.
	* call.c (magic_varargs_p): Likewise.

From-SVN: r237563
parent bf54f123
2016-06-17 Jakub Jelinek <jakub@redhat.com>
* tree.c (builtin_valid_in_constant_expr_p): Test for
DECL_BUILT_IN_CLASS equal to BUILT_IN_NORMAL instead of just
DECL_BUILT_IN.
(bot_manip): Likewise.
* call.c (magic_varargs_p): Likewise.
2016-06-17 Paolo Carlini <paolo.carlini@oracle.com> 2016-06-17 Paolo Carlini <paolo.carlini@oracle.com>
* decl.c (grokfndecl): Change pair of errors to error + inform. * decl.c (grokfndecl): Change pair of errors to error + inform.
......
...@@ -7140,7 +7140,7 @@ magic_varargs_p (tree fn) ...@@ -7140,7 +7140,7 @@ magic_varargs_p (tree fn)
if (flag_cilkplus && is_cilkplus_reduce_builtin (fn) != BUILT_IN_NONE) if (flag_cilkplus && is_cilkplus_reduce_builtin (fn) != BUILT_IN_NONE)
return 2; return 2;
if (DECL_BUILT_IN (fn)) if (DECL_BUILT_IN_CLASS (fn) == BUILT_IN_NORMAL)
switch (DECL_FUNCTION_CODE (fn)) switch (DECL_FUNCTION_CODE (fn))
{ {
case BUILT_IN_CLASSIFY_TYPE: case BUILT_IN_CLASSIFY_TYPE:
......
...@@ -341,7 +341,8 @@ cp_stabilize_reference (tree ref) ...@@ -341,7 +341,8 @@ cp_stabilize_reference (tree ref)
bool bool
builtin_valid_in_constant_expr_p (const_tree decl) builtin_valid_in_constant_expr_p (const_tree decl)
{ {
if (!(TREE_CODE (decl) == FUNCTION_DECL && DECL_BUILT_IN (decl))) if (!(TREE_CODE (decl) == FUNCTION_DECL
&& DECL_BUILT_IN_CLASS (decl) == BUILT_IN_NORMAL))
/* Not a built-in. */ /* Not a built-in. */
return false; return false;
switch (DECL_FUNCTION_CODE (decl)) switch (DECL_FUNCTION_CODE (decl))
...@@ -2536,7 +2537,7 @@ bot_manip (tree* tp, int* walk_subtrees, void* data) ...@@ -2536,7 +2537,7 @@ bot_manip (tree* tp, int* walk_subtrees, void* data)
/* builtin_LINE and builtin_FILE get the location where the default /* builtin_LINE and builtin_FILE get the location where the default
argument is expanded, not where the call was written. */ argument is expanded, not where the call was written. */
tree callee = get_callee_fndecl (*tp); tree callee = get_callee_fndecl (*tp);
if (callee && DECL_BUILT_IN (callee)) if (callee && DECL_BUILT_IN_CLASS (callee) == BUILT_IN_NORMAL)
switch (DECL_FUNCTION_CODE (callee)) switch (DECL_FUNCTION_CODE (callee))
{ {
case BUILT_IN_FILE: case BUILT_IN_FILE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment