summaryrefslogtreecommitdiff
path: root/gcc/cp/tree.c
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2016-06-17 19:49:49 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2016-06-17 19:49:49 +0000
commit0e6099f1aeabec3850f05942d6b58486ea6b1666 (patch)
tree73341ee471d2e43e911a83a87fc47007b162bf4b /gcc/cp/tree.c
parent358cee25f31ce143b02e76eff93b24f88ebce256 (diff)
downloadgcc-0e6099f1aeabec3850f05942d6b58486ea6b1666.tar.gz
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@237563 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/tree.c')
-rw-r--r--gcc/cp/tree.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 9ab964d0b13..6010f63746f 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -341,7 +341,8 @@ cp_stabilize_reference (tree ref)
bool
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. */
return false;
switch (DECL_FUNCTION_CODE (decl))
@@ -2536,7 +2537,7 @@ bot_manip (tree* tp, int* walk_subtrees, void* data)
/* builtin_LINE and builtin_FILE get the location where the default
argument is expanded, not where the call was written. */
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))
{
case BUILT_IN_FILE: