From f26881e300b648e46ae89e24575fe493d772802f Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Tue, 31 Oct 2017 16:27:59 +0000 Subject: [PATCH] [C++ PATCH] overloaded operator fns [3/N] https://gcc.gnu.org/ml/gcc-patches/2017-10/msg02343.html * cp-tree.h (enum ovl_op_flags): New. (struct operator_name_info_t): Rename arity to flags. * lex.c (set_operator_ident): New. (init_operators): Use it. Adjust for flags. * mangle.c (write_unqualified_id): Adjust for flags. * operators.def: Replace arity with flags. From-SVN: r254271 --- gcc/cp/ChangeLog | 7 ++ gcc/cp/cp-tree.h | 19 ++++-- gcc/cp/lex.c | 49 +++++++------- gcc/cp/mangle.c | 2 +- gcc/cp/operators.def | 149 ++++++++++++++++++++++--------------------- 5 files changed, 126 insertions(+), 100 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cca3a4b9fc5..82651bf3237 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,12 @@ 2017-10-31 Nathan Sidwell + * cp-tree.h (enum ovl_op_flags): New. + (struct operator_name_info_t): Rename arity to flags. + * lex.c (set_operator_ident): New. + (init_operators): Use it. Adjust for flags. + * mangle.c (write_unqualified_id): Adjust for flags. + * operators.def: Replace arity with flags. + * cp-tree.h (ovl_op_identifier): New. (assign_op_identifier, call_op_identifier): Adjust. (cp_operator_id, cp_assignment_operator_ide): Delete. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index a9b2304d10f..c74a1860ec4 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -5474,16 +5474,27 @@ enum auto_deduction_context extern void init_reswords (void); -typedef struct GTY(()) operator_name_info_t { +/* Various flags for the overloaded operator information. */ +enum ovl_op_flags + { + OVL_OP_FLAG_NONE = 0, + OVL_OP_FLAG_UNARY = 1, + OVL_OP_FLAG_BINARY = 2, + OVL_OP_FLAG_ALLOC = 4, /* operator new or delete */ + OVL_OP_FLAG_DELETE = 1, /* operator delete */ + OVL_OP_FLAG_VEC = 2 /* vector new or delete */ + }; + +struct GTY(()) operator_name_info_t { /* The IDENTIFIER_NODE for the operator. */ tree identifier; /* The name of the operator. */ const char *name; /* The mangled name of the operator. */ const char *mangled_name; - /* The arity of the operator. */ - int arity; -} operator_name_info_t; + /* The ovl_op_flags of the operator */ + unsigned flags : 8; +}; /* A mapping from tree codes to operator name information. */ extern GTY(()) operator_name_info_t operator_name_info diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index ff7160eb3af..cd2d886b1eb 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -82,13 +82,6 @@ operator_name_info_t operator_name_info[(int) MAX_TREE_CODES]; /* Similar, but for assignment operators. */ operator_name_info_t assignment_operator_name_info[(int) MAX_TREE_CODES]; -/* Initialize data structures that keep track of operator names. */ - -#define DEF_OPERATOR(NAME, C, M, AR, AP) \ - CONSTRAINT (C, sizeof "operator " + sizeof NAME <= 256); -#include "operators.def" -#undef DEF_OPERATOR - /* Get the name of the kind of identifier T. */ const char * @@ -120,28 +113,40 @@ set_identifier_kind (tree id, cp_identifier_kind kind) IDENTIFIER_KIND_BIT_0 (id) |= (kind >> 0) & 1; } +/* Create and tag the internal operator name for the overloaded + operator PTR describes. */ + +static tree +set_operator_ident (operator_name_info_t *ptr) +{ + char buffer[32]; + size_t len = snprintf (buffer, sizeof (buffer), "operator%s%s", + &" "[ptr->name[0] && ptr->name[0] != '_' + && !ISALPHA (ptr->name[0])], + ptr->name); + gcc_checking_assert (len < sizeof (buffer)); + + tree ident = get_identifier_with_length (buffer, len); + ptr->identifier = ident; + + return ident; +} + static void init_operators (void) { tree identifier; - char buffer[256]; - struct operator_name_info_t *oni; + operator_name_info_t *oni; -#define DEF_OPERATOR(NAME, CODE, MANGLING, ARITY, KIND) \ - sprintf (buffer, "operator%s%s", !NAME[0] \ - || NAME[0] == '_' || ISALPHA (NAME[0]) ? " " : "", NAME); \ - identifier = get_identifier (buffer); \ - \ - if (KIND != cik_simple_op || !IDENTIFIER_ANY_OP_P (identifier)) \ - set_identifier_kind (identifier, KIND); \ - \ - oni = (KIND == cik_assign_op \ - ? &assignment_operator_name_info[(int) CODE] \ - : &operator_name_info[(int) CODE]); \ - oni->identifier = identifier; \ +#define DEF_OPERATOR(NAME, CODE, MANGLING, FLAGS, KIND) \ + oni = OVL_OP_INFO (KIND == cik_assign_op, CODE); \ oni->name = NAME; \ oni->mangled_name = MANGLING; \ - oni->arity = ARITY; + oni->flags = FLAGS; \ + identifier = set_operator_ident (oni); \ + \ + if (KIND != cik_simple_op || !IDENTIFIER_ANY_OP_P (identifier)) \ + set_identifier_kind (identifier, KIND); #include "operators.def" #undef DEF_OPERATOR diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index fe0aeaca2e3..b745576cd33 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -1276,7 +1276,7 @@ write_unqualified_id (tree identifier) { /* The ABI says that we prefer binary operator names to unary operator names. */ - if (operator_name_info[i].arity == 2) + if (operator_name_info[i].flags == OVL_OP_FLAG_BINARY) { mangled_name = operator_name_info[i].mangled_name; break; diff --git a/gcc/cp/operators.def b/gcc/cp/operators.def index 7dfdd227241..51f74652943 100644 --- a/gcc/cp/operators.def +++ b/gcc/cp/operators.def @@ -45,11 +45,10 @@ along with GCC; see the file COPYING3. If not see mangled under the new ABI. For `operator +', for example, this would be "pl". - ARITY + FLAGS - The arity of the operator, or -1 if any arity is allowed. (As - for `operator ()'.) Postincrement and postdecrement operators - are marked as binary. + ovl_op_flags bits. Postincrement and postdecrement operators are + marked as binary. ASSN_P @@ -66,95 +65,99 @@ along with GCC; see the file COPYING3. If not see arguments are as for DEF_OPERATOR, but there is no need to provide an ASSIGNMENT_P argument; it is always zero. */ -#define DEF_SIMPLE_OPERATOR(NAME, CODE, MANGLING, ARITY) \ - DEF_OPERATOR(NAME, CODE, MANGLING, ARITY, cik_simple_op) +#define DEF_SIMPLE_OPERATOR(NAME, CODE, MANGLING, FLAGS) \ + DEF_OPERATOR(NAME, CODE, MANGLING, FLAGS, cik_simple_op) /* Use DEF_ASSN_OPERATOR to define an assignment operator. Its arguments are as for DEF_OPERATOR, but there is no need to provide an ASSIGNMENT_P argument; it is always one. */ -#define DEF_ASSN_OPERATOR(NAME, CODE, MANGLING, ARITY) \ - DEF_OPERATOR(NAME, CODE, MANGLING, ARITY, cik_assign_op) +#define DEF_ASSN_OPERATOR(NAME, CODE, MANGLING, FLAGS) \ + DEF_OPERATOR(NAME, CODE, MANGLING, FLAGS, cik_assign_op) /* Memory allocation operators. */ -DEF_OPERATOR ("new", NEW_EXPR, "nw", -1, cik_newdel_op) -DEF_OPERATOR ("new []", VEC_NEW_EXPR, "na", -1, cik_newdel_op) -DEF_OPERATOR ("delete", DELETE_EXPR, "dl", -1, cik_newdel_op) -DEF_OPERATOR ("delete []", VEC_DELETE_EXPR, "da", -1, cik_newdel_op) +DEF_OPERATOR ("new", NEW_EXPR, "nw", OVL_OP_FLAG_ALLOC, cik_newdel_op) +DEF_OPERATOR ("new []", VEC_NEW_EXPR, "na", + OVL_OP_FLAG_ALLOC | OVL_OP_FLAG_VEC, cik_newdel_op) +DEF_OPERATOR ("delete", DELETE_EXPR, "dl", + OVL_OP_FLAG_ALLOC | OVL_OP_FLAG_DELETE, cik_newdel_op) +DEF_OPERATOR ("delete []", VEC_DELETE_EXPR, "da", + OVL_OP_FLAG_ALLOC | OVL_OP_FLAG_DELETE | OVL_OP_FLAG_VEC, + cik_newdel_op) /* Unary operators. */ -DEF_SIMPLE_OPERATOR ("+", UNARY_PLUS_EXPR, "ps", 1) -DEF_SIMPLE_OPERATOR ("-", NEGATE_EXPR, "ng", 1) -DEF_SIMPLE_OPERATOR ("&", ADDR_EXPR, "ad", 1) -DEF_SIMPLE_OPERATOR ("*", INDIRECT_REF, "de", 1) -DEF_SIMPLE_OPERATOR ("~", BIT_NOT_EXPR, "co", 1) -DEF_SIMPLE_OPERATOR ("!", TRUTH_NOT_EXPR, "nt", 1) -DEF_SIMPLE_OPERATOR ("++", PREINCREMENT_EXPR, "pp", 1) -DEF_SIMPLE_OPERATOR ("--", PREDECREMENT_EXPR, "mm", 1) -DEF_SIMPLE_OPERATOR ("sizeof", SIZEOF_EXPR, "sz", 1) +DEF_SIMPLE_OPERATOR ("+", UNARY_PLUS_EXPR, "ps", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("-", NEGATE_EXPR, "ng", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("&", ADDR_EXPR, "ad", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("*", INDIRECT_REF, "de", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("~", BIT_NOT_EXPR, "co", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("!", TRUTH_NOT_EXPR, "nt", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("++", PREINCREMENT_EXPR, "pp", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("--", PREDECREMENT_EXPR, "mm", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("sizeof", SIZEOF_EXPR, "sz", OVL_OP_FLAG_UNARY) /* These are extensions. */ -DEF_SIMPLE_OPERATOR ("alignof", ALIGNOF_EXPR, "az", 1) -DEF_SIMPLE_OPERATOR ("__imag__", IMAGPART_EXPR, "v18__imag__", 1) -DEF_SIMPLE_OPERATOR ("__real__", REALPART_EXPR, "v18__real__", 1) +DEF_SIMPLE_OPERATOR ("alignof", ALIGNOF_EXPR, "az", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("__imag__", IMAGPART_EXPR, "v18__imag__", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("__real__", REALPART_EXPR, "v18__real__", OVL_OP_FLAG_UNARY) /* The cast operators. */ -DEF_SIMPLE_OPERATOR ("", CAST_EXPR, "cv", 1) -DEF_SIMPLE_OPERATOR ("dynamic_cast", DYNAMIC_CAST_EXPR, "dc", 1) -DEF_SIMPLE_OPERATOR ("reinterpret_cast", REINTERPRET_CAST_EXPR, "rc", 1) -DEF_SIMPLE_OPERATOR ("const_cast", CONST_CAST_EXPR, "cc", 1) -DEF_SIMPLE_OPERATOR ("static_cast", STATIC_CAST_EXPR, "sc", 1) +DEF_SIMPLE_OPERATOR ("", CAST_EXPR, "cv", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("dynamic_cast", DYNAMIC_CAST_EXPR, "dc", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("reinterpret_cast", REINTERPRET_CAST_EXPR, "rc", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("const_cast", CONST_CAST_EXPR, "cc", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("static_cast", STATIC_CAST_EXPR, "sc", OVL_OP_FLAG_UNARY) /* Binary operators. */ -DEF_SIMPLE_OPERATOR ("+", PLUS_EXPR, "pl", 2) -DEF_SIMPLE_OPERATOR ("-", MINUS_EXPR, "mi", 2) -DEF_SIMPLE_OPERATOR ("*", MULT_EXPR, "ml", 2) -DEF_SIMPLE_OPERATOR ("/", TRUNC_DIV_EXPR, "dv", 2) -DEF_SIMPLE_OPERATOR ("%", TRUNC_MOD_EXPR, "rm", 2) -DEF_SIMPLE_OPERATOR ("&", BIT_AND_EXPR, "an", 2) -DEF_SIMPLE_OPERATOR ("|", BIT_IOR_EXPR, "or", 2) -DEF_SIMPLE_OPERATOR ("^", BIT_XOR_EXPR, "eo", 2) -DEF_SIMPLE_OPERATOR ("<<", LSHIFT_EXPR, "ls", 2) -DEF_SIMPLE_OPERATOR (">>", RSHIFT_EXPR, "rs", 2) -DEF_SIMPLE_OPERATOR ("==", EQ_EXPR, "eq", 2) -DEF_SIMPLE_OPERATOR ("!=", NE_EXPR, "ne", 2) -DEF_SIMPLE_OPERATOR ("<", LT_EXPR, "lt", 2) -DEF_SIMPLE_OPERATOR (">", GT_EXPR, "gt", 2) -DEF_SIMPLE_OPERATOR ("<=", LE_EXPR, "le", 2) -DEF_SIMPLE_OPERATOR (">=", GE_EXPR, "ge", 2) -DEF_SIMPLE_OPERATOR ("&&", TRUTH_ANDIF_EXPR, "aa", 2) -DEF_SIMPLE_OPERATOR ("||", TRUTH_ORIF_EXPR, "oo", 2) -DEF_SIMPLE_OPERATOR (",", COMPOUND_EXPR, "cm", 2) -DEF_SIMPLE_OPERATOR ("->*", MEMBER_REF, "pm", 2) -DEF_SIMPLE_OPERATOR (".*", DOTSTAR_EXPR, "ds", 2) -DEF_SIMPLE_OPERATOR ("->", COMPONENT_REF, "pt", 2) -DEF_SIMPLE_OPERATOR ("[]", ARRAY_REF, "ix", 2) -DEF_SIMPLE_OPERATOR ("++", POSTINCREMENT_EXPR, "pp", 2) -DEF_SIMPLE_OPERATOR ("--", POSTDECREMENT_EXPR, "mm", 2) +DEF_SIMPLE_OPERATOR ("+", PLUS_EXPR, "pl", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("-", MINUS_EXPR, "mi", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("*", MULT_EXPR, "ml", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("/", TRUNC_DIV_EXPR, "dv", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("%", TRUNC_MOD_EXPR, "rm", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("&", BIT_AND_EXPR, "an", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("|", BIT_IOR_EXPR, "or", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("^", BIT_XOR_EXPR, "eo", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("<<", LSHIFT_EXPR, "ls", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR (">>", RSHIFT_EXPR, "rs", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("==", EQ_EXPR, "eq", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("!=", NE_EXPR, "ne", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("<", LT_EXPR, "lt", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR (">", GT_EXPR, "gt", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("<=", LE_EXPR, "le", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR (">=", GE_EXPR, "ge", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("&&", TRUTH_ANDIF_EXPR, "aa", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("||", TRUTH_ORIF_EXPR, "oo", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR (",", COMPOUND_EXPR, "cm", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("->*", MEMBER_REF, "pm", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR (".*", DOTSTAR_EXPR, "ds", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("->", COMPONENT_REF, "pt", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("[]", ARRAY_REF, "ix", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("++", POSTINCREMENT_EXPR, "pp", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("--", POSTDECREMENT_EXPR, "mm", OVL_OP_FLAG_BINARY) /* This one is needed for mangling. */ -DEF_SIMPLE_OPERATOR ("::", SCOPE_REF, "sr", 2) +DEF_SIMPLE_OPERATOR ("::", SCOPE_REF, "sr", OVL_OP_FLAG_BINARY) /* Assignment operators. */ -DEF_ASSN_OPERATOR ("=", NOP_EXPR, "aS", 2) -DEF_ASSN_OPERATOR ("+=", PLUS_EXPR, "pL", 2) -DEF_ASSN_OPERATOR ("-=", MINUS_EXPR, "mI", 2) -DEF_ASSN_OPERATOR ("*=", MULT_EXPR, "mL", 2) -DEF_ASSN_OPERATOR ("/=", TRUNC_DIV_EXPR, "dV", 2) -DEF_ASSN_OPERATOR ("%=", TRUNC_MOD_EXPR, "rM", 2) -DEF_ASSN_OPERATOR ("&=", BIT_AND_EXPR, "aN", 2) -DEF_ASSN_OPERATOR ("|=", BIT_IOR_EXPR, "oR", 2) -DEF_ASSN_OPERATOR ("^=", BIT_XOR_EXPR, "eO", 2) -DEF_ASSN_OPERATOR ("<<=", LSHIFT_EXPR, "lS", 2) -DEF_ASSN_OPERATOR (">>=", RSHIFT_EXPR, "rS", 2) +DEF_ASSN_OPERATOR ("=", NOP_EXPR, "aS", OVL_OP_FLAG_BINARY) +DEF_ASSN_OPERATOR ("+=", PLUS_EXPR, "pL", OVL_OP_FLAG_BINARY) +DEF_ASSN_OPERATOR ("-=", MINUS_EXPR, "mI", OVL_OP_FLAG_BINARY) +DEF_ASSN_OPERATOR ("*=", MULT_EXPR, "mL", OVL_OP_FLAG_BINARY) +DEF_ASSN_OPERATOR ("/=", TRUNC_DIV_EXPR, "dV", OVL_OP_FLAG_BINARY) +DEF_ASSN_OPERATOR ("%=", TRUNC_MOD_EXPR, "rM", OVL_OP_FLAG_BINARY) +DEF_ASSN_OPERATOR ("&=", BIT_AND_EXPR, "aN", OVL_OP_FLAG_BINARY) +DEF_ASSN_OPERATOR ("|=", BIT_IOR_EXPR, "oR", OVL_OP_FLAG_BINARY) +DEF_ASSN_OPERATOR ("^=", BIT_XOR_EXPR, "eO", OVL_OP_FLAG_BINARY) +DEF_ASSN_OPERATOR ("<<=", LSHIFT_EXPR, "lS", OVL_OP_FLAG_BINARY) +DEF_ASSN_OPERATOR (">>=", RSHIFT_EXPR, "rS", OVL_OP_FLAG_BINARY) /* Ternary operators. */ -DEF_SIMPLE_OPERATOR ("?:", COND_EXPR, "qu", 3) +DEF_SIMPLE_OPERATOR ("?:", COND_EXPR, "qu", OVL_OP_FLAG_NONE) /* Miscellaneous. */ -DEF_SIMPLE_OPERATOR ("()", CALL_EXPR, "cl", -1) +DEF_SIMPLE_OPERATOR ("()", CALL_EXPR, "cl", OVL_OP_FLAG_NONE) /* Variadic templates extension. */ -DEF_SIMPLE_OPERATOR ("...", EXPR_PACK_EXPANSION, "sp", 1) -DEF_SIMPLE_OPERATOR ("... +", UNARY_LEFT_FOLD_EXPR, "fl", 2) -DEF_SIMPLE_OPERATOR ("+ ...", UNARY_RIGHT_FOLD_EXPR, "fr", 2) -DEF_SIMPLE_OPERATOR ("+ ... +", BINARY_LEFT_FOLD_EXPR, "fL", 3) -DEF_SIMPLE_OPERATOR ("+ ... +", BINARY_RIGHT_FOLD_EXPR, "fR", 3) +DEF_SIMPLE_OPERATOR ("...", EXPR_PACK_EXPANSION, "sp", OVL_OP_FLAG_UNARY) +DEF_SIMPLE_OPERATOR ("... +", UNARY_LEFT_FOLD_EXPR, "fl", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("+ ...", UNARY_RIGHT_FOLD_EXPR, "fr", OVL_OP_FLAG_BINARY) +DEF_SIMPLE_OPERATOR ("+ ... +", BINARY_LEFT_FOLD_EXPR, "fL", OVL_OP_FLAG_NONE) +DEF_SIMPLE_OPERATOR ("+ ... +", BINARY_RIGHT_FOLD_EXPR, "fR", OVL_OP_FLAG_NONE)