aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/parser.c
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2017-01-31 01:02:03 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2017-01-31 01:02:03 +0000
commit8db29d88f3e8d5fc43b25d9e0049c25f6bfb74d1 (patch)
tree3901a07d4c4dde00dbe21a5d032c741cfc2aaaa2 /gcc/cp/parser.c
parent9f92b93b7b94f128c6b600bc360ec643bcfa9067 (diff)
downloadgcc-8db29d88f3e8d5fc43b25d9e0049c25f6bfb74d1.zip
gcc-8db29d88f3e8d5fc43b25d9e0049c25f6bfb74d1.tar.gz
gcc-8db29d88f3e8d5fc43b25d9e0049c25f6bfb74d1.tar.bz2
Introduce C++ support in libcc1
Extend libcc1's with an API for C++ support. Extend libcc1's C API to distinguish between integral types with the same width, as in C++. Likewise for float types. Export small bits of functionality from the C++ front-end for use in libcc1. Add support for the C++ front-end to look up names and addresses using a libcc1-registered binding oracle. Add support for global friends. for gcc/cp/ChangeLog Introduce C++ support in libcc1. * cp-tree.h (struct lang_identifier): Add oracle_looked_up. (ansi_opname): Rename to... (cp_operator_id): ... this. Adjust all callers. (ansi_assopname): Rename to... (cp_assignment_operator_id): ... this. Adjust all callers. (cp_literal_operator_id): Declare. (set_global_friend): Declare. (is_global_friend): Declare. (enum cp_oracle_request): New type. (cp_binding_oracle_function): New type. (cp_binding_oracle): Declare. (cp_finish_injected_record_type): Declare. * friend.c (global_friend): New var. (set_global_friend): New fn. (is_global_friend): New fn. (is_friend): Call is_global_friend. * name-lookup.c (cp_binding_oracle): New var. (query_oracle): New fn. (qualified_lookup_using_namespace): Call query_oracle. (lookup_name_real_1): Likewise. * parser.c (cp_literal_operator_id): Drop static. * search.c (friend_accessible_p): Call is_global_friend. * semantics.c (is_this_parameter): Accept a variable if the binding oracle is enabled. for include/ChangeLog Introduce C++ support in libcc1. * gcc-c-fe.def (int_type_v0): Rename from... (int_type): ... this. Introduce new version. (float_type_v0): Rename from... (float_type): ... this. Introduce new version. (char_type): New. * gcc-c-interface.h (gcc_c_api_version): Add GCC_C_FE_VERSION_1. (gcc_type_array): Move... * gcc-interface.h: ... here. * gcc-cp-fe.def: New. * gcc-cp-interface.h: New. for libcc1/ChangeLog Introduce C++ support. * Makefile.am (AM_CPPFLAGS): Move some -I flags to... (CPPFLAGS_FOR_C_FAMILY, CPPFLAGS_FOR_C, CPPFLAGS_FOR_CXX): ... new macros. (plugin_LTLIBRARIES): Add libcp1plugin.la. (BUILT_SOURCES, MOSTLYCLEANFILES): Add... (cp-compiler-name.h): ... this. New. (c-compiler-name.h): Rename all over from... (compiler-name.h): ... this. Create it atomically. (marshall_c_source, marshall_cxx_source): New macros. (libcc1plugin_la_SOURCES): Rename plugin.cc to libcc1plugin.cc. Add marshall_c_source expansion. (libcc1plugin.lo_CPPFLAGS): New macro. (libcp1plugin_la_LDFLAGS): Likewise. (libcp1plugin_la_SOURCES): Likewise. (libcp1plugin.lo_CPPFLAGS): Likewise. (libcp1plugin_la_LIBADD): Likewise. (libcp1plugin_la_DEPENDENCIES): Likewise. (libcp1plugin_la_LINK): Likewise. (libcc1_la_SOURCES): Added marshall_c_source and marshall_cxx_source expansions. * Makefile.in: Rebuild. * compiler-name.h: Rename all over to... * c-compiler-name.h: ... this. Define C_COMPILER_NAME instead of COMPILER_NAME. * plugin.cc: Rename all over to... * libcc1plugin.cc: ... this. Include marshall-c.hh. (address_rewriter): Drop cleaning up of VLA sizes. (plugin_build_decl): Mark decls as external. (plugin_tagbind): Propagate name to all variants. (build_anonymous_node): New. (plugin_build_record_type): Use it instead of make_node. (plugin_build_union_type): Likewise. (plugin_build_enum_type): Likewise. (plugin_finish_record_or_union): Update all type variants. (safe_lookup_builtin_type): New. (plugin_int_check): Factor out of, and add checks to, ... (plugin_int_type): ... this. Rename to... (plugin_int_type_v0): ... this. (plugin_int_type): New interface, new implementation. (plugin_char_type): New. (plugin_float_type_v0): Rename from... (plugin_float_type): ... this. New interface, new implementation. (plugin_init): Bump handshake version. * libcc1.cc: Include marshall-c.hh. Drop gcc-interface.h. (call_binding_oracle): Rename to... (c_call_binding_oracle): ... this, into anonymous namespace. (call_symbol_address): Rename to... (c_call_symbol_address): ... this, likewise. (GCC_METHOD#): Move methods into cc1plugin::c:: namespace. (libcc1::compiler::find): Refer to C_COMPILER_NAME. (fork_exec): Bump to GCC_C_FE_VERSION_1. (libcc1_compile): Prefix callbacks with c_. (gcc_c_fe_context): Accept GCC_C_FE_VERSION_1. * libcc1.sym: Export gcc_cp_fe_context. * libcp1.cc: New, mostly copied and adjusted from libcc1.cc. * libcp1plugin.cc: New, initially copied from libcc1plugin.cc. * libcp1plugin.sym: New. * marshall-c.hh: New. Move C-specific types from... * marshall.cc: ... this. (cc1_plugin::marshall_array_start): New. (cc1_plugin::marshall_array_elmts): New. (cc1_plugin::marshall for gcc_type_array): Use the above. (cc1_plugin::unmarshall_array_start): New. (cc1_plugin::unmarshall_array_elmts): New. (cc1_plugin::unmarshall for gcc_type_array): Use the above. * marshall.hh: Declare the new array building blocks. Drop C-specific unmarshall declarations. * marshall-cp.hh: New. * names.cc (GCC_METHOD#): Add LANG:: to method names. (LANG): Define while including gcc-c-fe.def and gcc-cp-fe.def. * names.hh: Include gcc-c-fe.def and gcc-cp-fe.def in the corresponding namespaces. * rpc.hh: Don't include marshall.hh. [GCC_CP_INTERFACE_H] (argument_wrapper): Specialize for gcc_vbase_array, gcc_cp_template_args, gcc_cp_function_args. From-SVN: r245051
Diffstat (limited to 'gcc/cp/parser.c')
-rw-r--r--gcc/cp/parser.c103
1 files changed, 50 insertions, 53 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 7f68550..592f903 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -249,9 +249,6 @@ static cp_token_cache *cp_token_cache_new
static void cp_parser_initial_pragma
(cp_token *);
-static tree cp_literal_operator_id
- (const char *);
-
static void cp_parser_cilk_simd
(cp_parser *, cp_token *, bool *);
static tree cp_parser_cilk_for
@@ -10279,7 +10276,7 @@ cp_parser_lambda_declarator_opt (cp_parser* parser, tree lambda_expr)
p = obstack_alloc (&declarator_obstack, 0);
- declarator = make_id_declarator (NULL_TREE, ansi_opname (CALL_EXPR),
+ declarator = make_id_declarator (NULL_TREE, cp_operator_id (CALL_EXPR),
sfk_none);
quals = (LAMBDA_EXPR_MUTABLE_P (lambda_expr)
@@ -14297,7 +14294,7 @@ cp_parser_operator_function_id (cp_parser* parser)
/* Return an identifier node for a user-defined literal operator.
The suffix identifier is chained to the operator name identifier. */
-static tree
+tree
cp_literal_operator_id (const char* name)
{
tree identifier;
@@ -14366,12 +14363,12 @@ cp_parser_operator (cp_parser* parser)
if (cp_token *close_token
= cp_parser_require (parser, CPP_CLOSE_SQUARE, RT_CLOSE_SQUARE))
end_loc = close_token->location;
- id = ansi_opname (op == NEW_EXPR
+ id = cp_operator_id (op == NEW_EXPR
? VEC_NEW_EXPR : VEC_DELETE_EXPR);
}
/* Otherwise, we have the non-array variant. */
else
- id = ansi_opname (op);
+ id = cp_operator_id (op);
location_t loc = make_location (start_loc, start_loc, end_loc);
@@ -14379,147 +14376,147 @@ cp_parser_operator (cp_parser* parser)
}
case CPP_PLUS:
- id = ansi_opname (PLUS_EXPR);
+ id = cp_operator_id (PLUS_EXPR);
break;
case CPP_MINUS:
- id = ansi_opname (MINUS_EXPR);
+ id = cp_operator_id (MINUS_EXPR);
break;
case CPP_MULT:
- id = ansi_opname (MULT_EXPR);
+ id = cp_operator_id (MULT_EXPR);
break;
case CPP_DIV:
- id = ansi_opname (TRUNC_DIV_EXPR);
+ id = cp_operator_id (TRUNC_DIV_EXPR);
break;
case CPP_MOD:
- id = ansi_opname (TRUNC_MOD_EXPR);
+ id = cp_operator_id (TRUNC_MOD_EXPR);
break;
case CPP_XOR:
- id = ansi_opname (BIT_XOR_EXPR);
+ id = cp_operator_id (BIT_XOR_EXPR);
break;
case CPP_AND:
- id = ansi_opname (BIT_AND_EXPR);
+ id = cp_operator_id (BIT_AND_EXPR);
break;
case CPP_OR:
- id = ansi_opname (BIT_IOR_EXPR);
+ id = cp_operator_id (BIT_IOR_EXPR);
break;
case CPP_COMPL:
- id = ansi_opname (BIT_NOT_EXPR);
+ id = cp_operator_id (BIT_NOT_EXPR);
break;
case CPP_NOT:
- id = ansi_opname (TRUTH_NOT_EXPR);
+ id = cp_operator_id (TRUTH_NOT_EXPR);
break;
case CPP_EQ:
- id = ansi_assopname (NOP_EXPR);
+ id = cp_assignment_operator_id (NOP_EXPR);
break;
case CPP_LESS:
- id = ansi_opname (LT_EXPR);
+ id = cp_operator_id (LT_EXPR);
break;
case CPP_GREATER:
- id = ansi_opname (GT_EXPR);
+ id = cp_operator_id (GT_EXPR);
break;
case CPP_PLUS_EQ:
- id = ansi_assopname (PLUS_EXPR);
+ id = cp_assignment_operator_id (PLUS_EXPR);
break;
case CPP_MINUS_EQ:
- id = ansi_assopname (MINUS_EXPR);
+ id = cp_assignment_operator_id (MINUS_EXPR);
break;
case CPP_MULT_EQ:
- id = ansi_assopname (MULT_EXPR);
+ id = cp_assignment_operator_id (MULT_EXPR);
break;
case CPP_DIV_EQ:
- id = ansi_assopname (TRUNC_DIV_EXPR);
+ id = cp_assignment_operator_id (TRUNC_DIV_EXPR);
break;
case CPP_MOD_EQ:
- id = ansi_assopname (TRUNC_MOD_EXPR);
+ id = cp_assignment_operator_id (TRUNC_MOD_EXPR);
break;
case CPP_XOR_EQ:
- id = ansi_assopname (BIT_XOR_EXPR);
+ id = cp_assignment_operator_id (BIT_XOR_EXPR);
break;
case CPP_AND_EQ:
- id = ansi_assopname (BIT_AND_EXPR);
+ id = cp_assignment_operator_id (BIT_AND_EXPR);
break;
case CPP_OR_EQ:
- id = ansi_assopname (BIT_IOR_EXPR);
+ id = cp_assignment_operator_id (BIT_IOR_EXPR);
break;
case CPP_LSHIFT:
- id = ansi_opname (LSHIFT_EXPR);
+ id = cp_operator_id (LSHIFT_EXPR);
break;
case CPP_RSHIFT:
- id = ansi_opname (RSHIFT_EXPR);
+ id = cp_operator_id (RSHIFT_EXPR);
break;
case CPP_LSHIFT_EQ:
- id = ansi_assopname (LSHIFT_EXPR);
+ id = cp_assignment_operator_id (LSHIFT_EXPR);
break;
case CPP_RSHIFT_EQ:
- id = ansi_assopname (RSHIFT_EXPR);
+ id = cp_assignment_operator_id (RSHIFT_EXPR);
break;
case CPP_EQ_EQ:
- id = ansi_opname (EQ_EXPR);
+ id = cp_operator_id (EQ_EXPR);
break;
case CPP_NOT_EQ:
- id = ansi_opname (NE_EXPR);
+ id = cp_operator_id (NE_EXPR);
break;
case CPP_LESS_EQ:
- id = ansi_opname (LE_EXPR);
+ id = cp_operator_id (LE_EXPR);
break;
case CPP_GREATER_EQ:
- id = ansi_opname (GE_EXPR);
+ id = cp_operator_id (GE_EXPR);
break;
case CPP_AND_AND:
- id = ansi_opname (TRUTH_ANDIF_EXPR);
+ id = cp_operator_id (TRUTH_ANDIF_EXPR);
break;
case CPP_OR_OR:
- id = ansi_opname (TRUTH_ORIF_EXPR);
+ id = cp_operator_id (TRUTH_ORIF_EXPR);
break;
case CPP_PLUS_PLUS:
- id = ansi_opname (POSTINCREMENT_EXPR);
+ id = cp_operator_id (POSTINCREMENT_EXPR);
break;
case CPP_MINUS_MINUS:
- id = ansi_opname (PREDECREMENT_EXPR);
+ id = cp_operator_id (PREDECREMENT_EXPR);
break;
case CPP_COMMA:
- id = ansi_opname (COMPOUND_EXPR);
+ id = cp_operator_id (COMPOUND_EXPR);
break;
case CPP_DEREF_STAR:
- id = ansi_opname (MEMBER_REF);
+ id = cp_operator_id (MEMBER_REF);
break;
case CPP_DEREF:
- id = ansi_opname (COMPONENT_REF);
+ id = cp_operator_id (COMPONENT_REF);
break;
case CPP_OPEN_PAREN:
@@ -14527,14 +14524,14 @@ cp_parser_operator (cp_parser* parser)
cp_lexer_consume_token (parser->lexer);
/* Look for the matching `)'. */
cp_parser_require (parser, CPP_CLOSE_PAREN, RT_CLOSE_PAREN);
- return ansi_opname (CALL_EXPR);
+ return cp_operator_id (CALL_EXPR);
case CPP_OPEN_SQUARE:
/* Consume the `['. */
cp_lexer_consume_token (parser->lexer);
/* Look for the matching `]'. */
cp_parser_require (parser, CPP_CLOSE_SQUARE, RT_CLOSE_SQUARE);
- return ansi_opname (ARRAY_REF);
+ return cp_operator_id (ARRAY_REF);
case CPP_UTF8STRING:
case CPP_UTF8STRING_USERDEF:
@@ -31991,21 +31988,21 @@ cp_parser_omp_clause_reduction (cp_parser *parser, tree list)
code = MIN_EXPR;
else if (strcmp (p, "max") == 0)
code = MAX_EXPR;
- else if (id == ansi_opname (PLUS_EXPR))
+ else if (id == cp_operator_id (PLUS_EXPR))
code = PLUS_EXPR;
- else if (id == ansi_opname (MULT_EXPR))
+ else if (id == cp_operator_id (MULT_EXPR))
code = MULT_EXPR;
- else if (id == ansi_opname (MINUS_EXPR))
+ else if (id == cp_operator_id (MINUS_EXPR))
code = MINUS_EXPR;
- else if (id == ansi_opname (BIT_AND_EXPR))
+ else if (id == cp_operator_id (BIT_AND_EXPR))
code = BIT_AND_EXPR;
- else if (id == ansi_opname (BIT_IOR_EXPR))
+ else if (id == cp_operator_id (BIT_IOR_EXPR))
code = BIT_IOR_EXPR;
- else if (id == ansi_opname (BIT_XOR_EXPR))
+ else if (id == cp_operator_id (BIT_XOR_EXPR))
code = BIT_XOR_EXPR;
- else if (id == ansi_opname (TRUTH_ANDIF_EXPR))
+ else if (id == cp_operator_id (TRUTH_ANDIF_EXPR))
code = TRUTH_ANDIF_EXPR;
- else if (id == ansi_opname (TRUTH_ORIF_EXPR))
+ else if (id == cp_operator_id (TRUTH_ORIF_EXPR))
code = TRUTH_ORIF_EXPR;
id = omp_reduction_id (code, id, NULL_TREE);
tree scope = parser->scope;