diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 2 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 7 | ||||
| -rw-r--r-- | gcc/cp/lambda.c | 7 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 | ||||
| -rw-r--r-- | gcc/tree-core.h | 3 | ||||
| -rw-r--r-- | gcc/tree.h | 9 |
7 files changed, 21 insertions, 11 deletions
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index bc8a03c..0754982 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -962,7 +962,7 @@ cp_genericize_r (tree *stmt_p, int *walk_subtrees, void *data) omp_cxx_notice_variable (wtd->omp_ctx, stmt); /* Don't dereference parms in a thunk, pass the references through. */ - if ((TREE_CODE (stmt) == CALL_EXPR && CALL_FROM_THUNK_P (stmt)) + if ((TREE_CODE (stmt) == CALL_EXPR && call_from_lambda_thunk_p (stmt)) || (TREE_CODE (stmt) == AGGR_INIT_EXPR && AGGR_INIT_FROM_THUNK_P (stmt))) { *walk_subtrees = 0; diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 3ccd54c..fda5ffa 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -464,7 +464,6 @@ extern GTY(()) tree cp_global_trees[CPTI_MAX]; SWITCH_STMT_NO_BREAK_P (in SWITCH_STMT) LAMBDA_EXPR_CAPTURE_OPTIMIZED (in LAMBDA_EXPR) IMPLICIT_CONV_EXPR_BRACED_INIT (in IMPLICIT_CONV_EXPR) - CALL_FROM_NEW_OR_DELETE_P (in CALL_EXPR) 3: IMPLICIT_RVALUE_P (in NON_LVALUE_EXPR or STATIC_CAST_EXPR) ICS_BAD_FLAG (in _CONV) FN_TRY_BLOCK_P (in TRY_BLOCK) @@ -3839,11 +3838,6 @@ struct GTY(()) lang_decl { should be performed at instantiation time. */ #define KOENIG_LOOKUP_P(NODE) TREE_LANG_FLAG_0 (CALL_EXPR_CHECK (NODE)) -/* In a CALL_EXPR, true for allocator calls from new or delete - expressions. */ -#define CALL_FROM_NEW_OR_DELETE_P(NODE) \ - TREE_LANG_FLAG_2 (CALL_EXPR_CHECK (NODE)) - /* True if the arguments to NODE should be evaluated in left-to-right order regardless of PUSH_ARGS_REVERSED. */ #define CALL_EXPR_ORDERED_ARGS(NODE) \ @@ -7268,6 +7262,7 @@ extern bool lambda_fn_in_template_p (tree); extern void maybe_add_lambda_conv_op (tree); extern bool is_lambda_ignored_entity (tree); extern bool lambda_static_thunk_p (tree); +extern bool call_from_lambda_thunk_p (tree); extern tree finish_builtin_launder (location_t, tree, tsubst_flags_t); extern tree cp_build_vec_convert (tree, location_t, tree, diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index 07a5401..1a1647f 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -1325,6 +1325,13 @@ lambda_static_thunk_p (tree fn) && LAMBDA_TYPE_P (CP_DECL_CONTEXT (fn))); } +bool +call_from_lambda_thunk_p (tree call) +{ + return (CALL_FROM_THUNK_P (call) + && lambda_static_thunk_p (current_function_decl)); +} + /* Returns true iff VAL is a lambda-related declaration which should be ignored by unqualified lookup. */ diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 45b18f6..72efecf 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -19955,7 +19955,7 @@ tsubst_copy_and_build (tree t, /* Stripped-down processing for a call in a thunk. Specifically, in the thunk template for a generic lambda. */ - if (CALL_FROM_THUNK_P (t)) + if (call_from_lambda_thunk_p (t)) { /* Now that we've expanded any packs, the number of call args might be different. */ diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 9166156..95b36a9 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -10171,7 +10171,7 @@ check_return_expr (tree retval, bool *no_warning) /* The call in a (lambda) thunk needs no conversions. */ if (TREE_CODE (retval) == CALL_EXPR - && CALL_FROM_THUNK_P (retval)) + && call_from_lambda_thunk_p (retval)) converted = true; /* First convert the value to the function's return type, then diff --git a/gcc/tree-core.h b/gcc/tree-core.h index 0e15878..752bec3 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -1220,7 +1220,8 @@ struct GTY(()) tree_base { all decls CALL_FROM_THUNK_P and - CALL_ALLOCA_FOR_VAR_P in + CALL_ALLOCA_FOR_VAR_P and + CALL_FROM_NEW_OR_DELETE_P in CALL_EXPR OMP_CLAUSE_LINEAR_VARIABLE_STRIDE in @@ -921,7 +921,8 @@ extern void omp_clause_range_check_failed (const_tree, const char *, int, (TREE_CHECK (NODE, PARM_DECL)->decl_common.decl_nonshareable_flag) /* In a CALL_EXPR, means that the call is the jump from a thunk to the - thunked-to function. */ + thunked-to function. Be careful to avoid using this macro when one of the + next two applies instead. */ #define CALL_FROM_THUNK_P(NODE) (CALL_EXPR_CHECK (NODE)->base.protected_flag) /* In a CALL_EXPR, if the function being called is BUILT_IN_ALLOCA, means that @@ -931,6 +932,12 @@ extern void omp_clause_range_check_failed (const_tree, const char *, int, #define CALL_ALLOCA_FOR_VAR_P(NODE) \ (CALL_EXPR_CHECK (NODE)->base.protected_flag) +/* In a CALL_EXPR, if the function being called is DECL_IS_OPERATOR_NEW_P or + DECL_IS_OPERATOR_DELETE_P, true for allocator calls from C++ new or delete + expressions. */ +#define CALL_FROM_NEW_OR_DELETE_P(NODE) \ + (CALL_EXPR_CHECK (NODE)->base.protected_flag) + /* Used in classes in C++. */ #define TREE_PRIVATE(NODE) ((NODE)->base.private_flag) /* Used in classes in C++. */ |