diff options
Diffstat (limited to 'gcc/cp/call.c')
| -rw-r--r-- | gcc/cp/call.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 367d42b..050d045 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -51,6 +51,7 @@ along with GCC; see the file COPYING3. If not see enum conversion_kind { ck_identity, ck_lvalue, + ck_tsafe, ck_qual, ck_std, ck_ptr, @@ -1265,6 +1266,17 @@ standard_conversion (tree to, tree from, tree expr, bool c_cast_p, conv = build_conv (ck_ptr, from, conv); conv->base_p = true; } + else if (tx_safe_fn_type_p (TREE_TYPE (from))) + { + /* A prvalue of type "pointer to transaction_safe function" can be + converted to a prvalue of type "pointer to function". */ + tree unsafe = tx_unsafe_fn_variant (TREE_TYPE (from)); + if (same_type_p (unsafe, TREE_TYPE (to))) + { + from = build_pointer_type (unsafe); + conv = build_conv (ck_tsafe, from, conv); + } + } if (tcode == POINTER_TYPE) { @@ -6638,6 +6650,11 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum, case ck_lvalue: return decay_conversion (expr, complain); + case ck_tsafe: + /* ??? Should the address of a transaction-safe pointer point to the TM + clone, and this conversion look up the primary function? */ + return build_nop (totype, expr); + case ck_qual: /* Warn about deprecated conversion if appropriate. */ string_conv_p (totype, expr, 1); |