Tcwg-commits July 2015

tcwg-commits@lists.linaro.org

2 participants
1355 discussions

[gcc] 18/20: libcp1plugin: update to new hashtable interface

by git

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch aoliva/libcp1 in repository gcc. commit 5cc4ecf9d55a494f1936b721560b2459e10123ea Author: Alexandre Oliva <aoliva(a)redhat.com> Date: Thu Jul 23 11:50:30 2015 -0300 libcp1plugin: update to new hashtable interface --- libcc1/libcp1plugin.cc | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc index 862803e..c868142 100644 --- a/libcc1/libcp1plugin.cc +++ b/libcc1/libcp1plugin.cc @@ -112,11 +112,8 @@ struct decl_addr_value tree address; }; -struct decl_addr_hasher : typed_free_remove<decl_addr_value> +struct decl_addr_hasher : free_ptr_hash<decl_addr_value> { - typedef decl_addr_value *value_type; - typedef decl_addr_value *compare_type; - static inline hashval_t hash (const decl_addr_value *); static inline bool equal (const decl_addr_value *, const decl_addr_value *); }; @@ -135,11 +132,8 @@ decl_addr_hasher::equal (const decl_addr_value *p1, const decl [...] -struct string_hasher : typed_noop_remove<const char> +struct string_hasher : nofree_ptr_hash<const char> { - typedef const char *value_type; - typedef const char *compare_type; - static inline hashval_t hash (const char *s) { return htab_hash_string (s); @@ -161,7 +155,7 @@ struct plugin_context : public cc1_plugin::connection hash_table<decl_addr_hasher> address_map; // A collection of trees that are preserved for the GC. - hash_table< pointer_hash<tree_node> > preserved; + hash_table< nofree_ptr_hash<tree_node> > preserved; // File name cache. hash_table<string_hasher> file_names; @@ -230,9 +224,8 @@ plugin_context::mark () ggc_mark ((*it)->address); } - for (hash_table< pointer_hash<tree_node> >::iterator it = preserved.begin (); - it != preserved.end (); - ++it) + for (hash_table< nofree_ptr_hash<tree_node> >::iterator + it = preserved.begin (); it != preserved.end (); ++it) ggc_mark (&*it); } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

9 years, 3 months

[gcc] 17/20: Add FIXME for cv-qualified function typedefs.

by git

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch aoliva/libcp1 in repository gcc. commit 124523db34abaab48a4a9c739fd531cc819bb745 Author: Alexandre Oliva <aoliva(a)redhat.com> Date: Fri Jul 3 13:32:24 2015 -0300 Add FIXME for cv-qualified function typedefs. --- include/gcc-cp-fe.def | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/gcc-cp-fe.def b/include/gcc-cp-fe.def index 56dc079..0dc3867 100644 --- a/include/gcc-cp-fe.def +++ b/include/gcc-cp-fe.def @@ -167,7 +167,12 @@ GCC_METHOD1 (int /* bool */, finish_enum_type, /* Create a new function type. RETURN_TYPE is the type returned by the function, and ARGUMENT_TYPES is a vector, of length NARGS, of the argument types. IS_VARARGS is true if the function is - varargs. */ + varargs. + + FIXME: C++ allows such stuff as "typedef int f() const;" to create + a cv-qualified (member) function type not associated with any + specific class, which can then be used to declare member functions + and pointers to member functions. Our API doesn't support this. */ GCC_METHOD3 (gcc_type, build_function_type, gcc_type, /* Argument RETURN_TYPE. */ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

9 years, 3 months

[gcc] 11/20: Fix variable-length arrays in C++

by git

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch aoliva/libcp1 in repository gcc. commit 9a1acbc240767dc85d7b308834ad26a6238c5882 Author: Alexandre Oliva <aoliva(a)redhat.com> Date: Fri Jun 12 02:10:39 2015 -0300 Fix variable-length arrays in C++ Use g++ infrastructure to save the computation of the array size, but this is not enough. The plugin is replacing the array type with a constant-sized array, so that building the auto array does not confuse later passes. This unfortunately breaks the deferred evaluation of sizeof done in C++, so I removed that, and made all decls for which addresses are given DECL_EXTERN, so that we don't even attempt to instantiate them. --- libcc1/libcp1plugin.cc | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc index a25e851..9acfe16 100644 --- a/libcc1/libcp1plugin.cc +++ b/libcc1/libcp1plugin.cc @@ -290,18 +290,7 @@ address_rewriter (tree *in, int *walk_subtrees, void *arg) value.decl = *in; decl_addr_value *found_value = ctx->address_map.find (&value); if (found_value != NULL) - { - // At this point we don't need VLA sizes for gdb-supplied - // variables, and having them here confuses later passes, so we - // drop them. - if (array_of_runtime_bound_p (TREE_TYPE (*in))) - { - TREE_TYPE (*in) - = build_array_type_nelts (TREE_TYPE (TREE_TYPE (*in)), 1); - DECL_SIZE (*in) = TYPE_SIZE (TREE_TYPE (*in)); - DECL_SIZE_UNIT (*in) = TYPE_SIZE_UNIT (TREE_TYPE (*in)); - } - } + ; else if (DECL_IS_BUILTIN (*in)) { gcc_address address; @@ -428,6 +417,7 @@ plugin_build_decl (cc1_plugin::connection *self, { decl_addr_value value; + DECL_EXTERNAL (decl) = 1; value.decl = decl; if (substitution_name != NULL) { @@ -761,10 +751,12 @@ plugin_build_vla_array_type (cc1_plugin::connection *self, { tree element_type = convert_in (element_type_in); tree upper_bound = lookup_name (get_identifier (upper_bound_name)); - tree range = build_index_type (upper_bound); + tree size = fold_build2 (PLUS_EXPR, TREE_TYPE (upper_bound), upper_bound, + build_one_cst (TREE_TYPE (upper_bound))); + tree range = compute_array_index_type (NULL_TREE, size, + tf_warning_or_error); tree result = build_cplus_array_type (element_type, range); - // C_TYPE_VARIABLE_SIZE (result) = 1; plugin_context *ctx = static_cast<plugin_context *> (self); return convert_out (ctx->preserve (result)); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

9 years, 3 months

[gcc] 10/20: Fix build_constant for C++.

by git

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch aoliva/libcp1 in repository gcc. commit f1a88e3527ed8e1e8b21fd8bfc19a6a285284d94 Author: Alexandre Oliva <aoliva(a)redhat.com> Date: Wed Jun 10 06:21:57 2015 -0300 Fix build_constant for C++. C++ wants CONST_DECLs to be used for enumerators only. Define a VAR_DECL with a READONLY and STATIC flags, and let cp_finish_decl take care of the initialization. Then introduce the declaration like other decls, removing the only remaining use of pushdecl_safe, so the function is removed too. --- libcc1/libcp1plugin.cc | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc index b0d1cb0..a25e851 100644 --- a/libcc1/libcp1plugin.cc +++ b/libcc1/libcp1plugin.cc @@ -153,22 +153,6 @@ struct string_hasher : typed_noop_remove<const char> -// A wrapper for pushdecl that doesn't let gdb have a chance to -// instantiate a symbol. - -static void -pushdecl_safe (tree decl) -{ - void (*save) (enum cp_oracle_request, tree identifier); - - save = cp_binding_oracle; - cp_binding_oracle = NULL; - pushdecl (decl); - cp_binding_oracle = save; -} - - - struct plugin_context : public cc1_plugin::connection { plugin_context (int fd); @@ -831,10 +815,14 @@ plugin_build_constant (cc1_plugin::connection *self, gcc_type [...] tree type = convert_in (type_in); cst = build_int_cst (type, value); + if (!TYPE_READONLY (type)) + type = build_qualified_type (type, TYPE_QUAL_CONST); decl = build_decl (ctx->get_source_location (filename, line_number), - CONST_DECL, get_identifier (name), type); - DECL_INITIAL (decl) = cst; - pushdecl_safe (decl); + VAR_DECL, get_identifier (name), type); + TREE_STATIC (decl) = 1; + TREE_READONLY (decl) = 1; + cp_finish_decl (decl, cst, true, NULL, LOOKUP_ONLYCONVERTING); + pushdecl_maybe_friend (decl, false); return 1; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

9 years, 3 months

[gcc] 14/20: libcp1plugin: implement non-field class members; fix build_memfn_type call

by git

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch aoliva/libcp1 in repository gcc. commit 097b295c9216303913b6f28ae3ee160e409d0dd1 Author: Alexandre Oliva <aoliva(a)redhat.com> Date: Thu Jul 2 15:40:31 2015 -0300 libcp1plugin: implement non-field class members; fix build_memfn_type call --- libcc1/libcp1plugin.cc | 66 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc index 173b21d..0e71c0e 100644 --- a/libcc1/libcp1plugin.cc +++ b/libcc1/libcp1plugin.cc @@ -414,12 +414,12 @@ plugin_get_current_binding_level (cc1_plugin::connection *self) tree decl; - if (current_class_type) - decl = TYPE_NAME (current_class_type); - else if (current_function_decl) - decl = current_function_decl; - else if (toplevel_bindings_p ()) + if (at_namespace_scope_p ()) decl = current_namespace; + else if (at_function_scope_p ()) + decl = current_function_decl; + else if (at_class_scope_p ()) + decl = TYPE_NAME (current_class_type); else gcc_unreachable (); @@ -454,8 +454,13 @@ plugin_new_decl (cc1_plugin::connection *self, tree decl; tree sym_type = convert_in (sym_type_in); + bool virtualp = false;; + switch (sym_kind) { + case GCC_CP_SYMBOL_VIRTUAL_FUNCTION: + virtualp = true; + /* Fallthrough. */ case GCC_CP_SYMBOL_FUNCTION: code = FUNCTION_DECL; break; @@ -479,18 +484,43 @@ plugin_new_decl (cc1_plugin::connection *self, } source_location loc = ctx->get_source_location (filename, line_number); + bool class_member_p = at_class_scope_p (); if (code == FUNCTION_DECL) { - decl = build_lang_decl (code, identifier, sym_type); - DECL_SOURCE_LOCATION (decl) = loc; + decl = build_lang_decl_loc (loc, code, identifier, sym_type); SET_DECL_LANGUAGE (decl, lang_cplusplus); // FIXME: current_lang_name is lan [...] + if (class_member_p) + { + if (TREE_CODE (sym_type) == FUNCTION_TYPE) + DECL_STATIC_FUNCTION_P (decl) = 1; + if (virtualp) + DECL_VIRTUAL_P (decl) = 1; + // FIXME: ctor, dtor, operators + } + } + else if (class_member_p) + { + decl = build_lang_decl_loc (loc, code, identifier, sym_type); + if (TREE_CODE (sym_type) == VAR_DECL) + { + // This block does the same as: + // set_linkage_for_static_data_member (decl); + TREE_PUBLIC (decl) = 1; + TREE_STATIC (decl) = 1; + DECL_INTERFACE_KNOWN (decl) = 1; + } } else decl = build_decl (loc, code, identifier, sym_type); TREE_USED (decl) = 1; TREE_ADDRESSABLE (decl) = 1; + if (class_member_p) + DECL_CONTEXT (decl) = FROB_CONTEXT (current_class_type); + else if (at_namespace_scope_p ()) + DECL_CONTEXT (decl) = FROB_CONTEXT (current_decl_namespace ()); + if (sym_kind != GCC_CP_SYMBOL_TYPEDEF) { decl_addr_value value; @@ -507,17 +537,25 @@ plugin_new_decl (cc1_plugin::connection *self, if (value.address == NULL_TREE) value.address = error_mark_node; } - else + else if (address) value.address = build_int_cst_type (ptr_type_node, address); - decl_addr_value **slot = ctx->address_map.find_slot (&value, INSERT); - gcc_assert (*slot == NULL); - *slot - = static_cast<decl_addr_value *> (xmalloc (sizeof (decl_addr_value))); - **slot = value; + else + value.address = NULL; + if (value.address) + { + decl_addr_value **slot = ctx->address_map.find_slot (&value, INSERT); + gcc_assert (*slot == NULL); + *slot + = static_cast<decl_addr_value *> (xmalloc (sizeof (decl_addr_value))); + **slot = value; + } } decl = safe_pushdecl_maybe_friend (decl, false); + if (class_member_p) + finish_member_declaration (decl); + rest_of_decl_compilation (decl, toplevel_bindings_p (), 0); return convert_out (ctx->preserve (decl)); @@ -781,7 +819,7 @@ plugin_build_method_type (cc1_plugin::connection *self, gcc_unreachable (); } - tree method_type = build_memfn_type (class_type, func_type, quals, rquals); + tree method_type = build_memfn_type (func_type, class_type, quals, rquals); plugin_context *ctx = static_cast<plugin_context *> (self); return convert_out (ctx->preserve (method_type)); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

9 years, 3 months

[gcc] 06/20: Fix enums.

by git

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch aoliva/libcp1 in repository gcc. commit e9a8104534fc7567cf325a6b28db180df92ae33e Author: Alexandre Oliva <aoliva(a)redhat.com> Date: Fri May 22 03:33:02 2015 -0300 Fix enums. Use more of the same machinery that the C++ parser uses to introduce tagged types. This enters and leaves scopes, so build_*_type and finish_*_type must be properly nested. All tagged types are added to the global namespace for now. --- libcc1/libcp1plugin.cc | 95 ++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 50 deletions(-) diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc index 30f3a57..d888b0a 100644 --- a/libcc1/libcp1plugin.cc +++ b/libcc1/libcp1plugin.cc @@ -476,15 +476,29 @@ plugin_bind (cc1_plugin::connection *, return 1; } -static tree name_placeholder; +// g++ really wants types to have names, even when they're anonymous. +// FIXME: we can't tell actual anonymous types. We should have type +// names specified earlier, otherwise we'll create wrong bindings +// within class defs. Maybe have a separate call to set scope, name +// and base classes wouldn't be a bad idea. + +static tree +get_placeholder_identifier () +{ + static tree name_placeholder; + if (!name_placeholder) + name_placeholder = get_identifier ("name placeholder"); + return name_placeholder; +} void cp_pushtag (location_t loc, tree name, tree type) { tree decl = TYPE_NAME (type); DECL_SOURCE_LOCATION (decl) = loc; - gcc_assert (DECL_NAME (decl) == name_placeholder || DECL_NAME (decl) == name); - DECL_NAME (decl) = name; + gcc_assert (DECL_NAME (decl) == name + || DECL_NAME (decl) == get_placeholder_identifier ()); + DECL_NAME (decl) = name; // FIXME: drop name_placeholder pushtag (name, type, ts_global); } @@ -494,8 +508,10 @@ plugin_tagbind (cc1_plugin::connection *self, const char *filename, unsigned int line_number) { plugin_context *ctx = static_cast<plugin_context *> (self); + push_nested_namespace (global_namespace); // FIXME cp_pushtag (ctx->get_source_location (filename, line_number), get_identifier (name), convert_in (tagged_type)); + pop_nested_namespace (global_namespace); // FIXME return 1; } @@ -510,26 +526,17 @@ plugin_build_pointer_type (cc1_plugin::connection *, // TYPE_NAME needs to be a valid pointer, even if there is no name available. static tree -build_anonymous_node (enum tree_code code) +build_named_class_type (enum tree_code code) { tree node; - if (code != ENUMERAL_TYPE) - { - node = make_class_type (code); - } - else - node = cxx_make_type (code); - if (!name_placeholder) // FIXME: have a separate call to set scope, name and bases - name_placeholder = get_identifier ("name placeholder"); + push_nested_namespace (global_namespace); // FIXME + node = make_class_type (code); tree type_decl = build_decl (input_location, TYPE_DECL, - name_placeholder, node); + get_placeholder_identifier (), node); TYPE_NAME (node) = type_decl; TYPE_STUB_DECL (node) = type_decl; - if (code != ENUMERAL_TYPE) - { - xref_basetypes (node, NULL); - begin_class_definition (node); - } + xref_basetypes (node, NULL); + begin_class_definition (node); return node; } @@ -537,14 +544,14 @@ gcc_type plugin_build_record_type (cc1_plugin::connection *self) { plugin_context *ctx = static_cast<plugin_context *> (self); - return convert_out (ctx->preserve (build_anonymous_node (RECORD_TYPE))); + return convert_out (ctx->preserve (build_named_class_type (RECORD_TYPE))); } gcc_type plugin_build_union_type (cc1_plugin::connection *self) { plugin_context *ctx = static_cast<plugin_context *> (self); - return convert_out (ctx->preserve (build_anonymous_node (UNION_TYPE))); + return convert_out (ctx->preserve (build_named_class_type (UNION_TYPE))); } int @@ -607,6 +614,11 @@ plugin_finish_record_or_union (cc1_plugin::connection *, finish_struct (record_or_union_type, NULL); + pop_nested_namespace (global_namespace); // FIXME + + gcc_assert (compare_tree_int (TYPE_SIZE_UNIT (record_or_union_type), + size_in_bytes) == 0); + return 1; } @@ -619,10 +631,15 @@ plugin_build_enum_type (cc1_plugin::connection *self, if (underlying_int_type == error_mark_node) return convert_out (error_mark_node); - tree result = build_anonymous_node (ENUMERAL_TYPE); + bool is_new_type = false; + bool scoped_enum_p = false; // FIXME + + push_nested_namespace (global_namespace); // FIXME + + tree result = start_enum (get_placeholder_identifier (), NULL_TREE, + underlying_int_type, scoped_enum_p, &is_new_type); - TYPE_PRECISION (result) = TYPE_PRECISION (underlying_int_type); - TYPE_UNSIGNED (result) = TYPE_UNSIGNED (underlying_int_type); + gcc_assert (is_new_type); plugin_context *ctx = static_cast<plugin_context *> (self); return convert_out (ctx->preserve (result)); @@ -634,21 +651,12 @@ plugin_build_add_enum_constant (cc1_plugin::connection *, const char *name, unsigned long value) { - tree cst, decl, cons; tree enum_type = convert_in (enum_type_in); gcc_assert (TREE_CODE (enum_type) == ENUMERAL_TYPE); - cst = build_int_cst (enum_type, value); - /* Note that gdb does not preserve the location of enum constants, - so we can't provide a decent location here. */ - decl = build_decl (BUILTINS_LOCATION, CONST_DECL, - get_identifier (name), enum_type); - DECL_INITIAL (decl) = cst; - pushdecl_safe (decl); - - cons = tree_cons (DECL_NAME (decl), cst, TYPE_VALUES (enum_type)); - TYPE_VALUES (enum_type) = cons; + build_enumerator (get_identifier (name), build_int_cst (enum_type, value), + enum_type, BUILTINS_LOCATION); return 1; } @@ -658,24 +666,11 @@ plugin_finish_enum_type (cc1_plugin::connection *, gcc_type enum_type_in) { tree enum_type = convert_in (enum_type_in); - tree minnode, maxnode, iter; - iter = TYPE_VALUES (enum_type); - minnode = maxnode = TREE_VALUE (iter); - for (iter = TREE_CHAIN (iter); - iter != NULL_TREE; - iter = TREE_CHAIN (iter)) - { - tree value = TREE_VALUE (iter); - if (tree_int_cst_lt (maxnode, value)) - maxnode = value; - if (tree_int_cst_lt (value, minnode)) - minnode = value; - } - TYPE_MIN_VALUE (enum_type) = minnode; - TYPE_MAX_VALUE (enum_type) = maxnode; + finish_enum_value_list (enum_type); + finish_enum (enum_type); - layout_type (enum_type); + pop_nested_namespace (global_namespace); // FIXME return 1; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

9 years, 3 months

[gcc] 08/20: Drop libcc1 plugin interfaces that are no longer used.

by git

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch aoliva/libcp1 in repository gcc. commit de5815d9110d47fd5afacb4e0b7e64e75ce9786d Author: Alexandre Oliva <aoliva(a)redhat.com> Date: Fri May 22 06:14:35 2015 -0300 Drop libcc1 plugin interfaces that are no longer used. --- gcc/cp/cp-tree.h | 6 ------ gcc/cp/name-lookup.c | 20 -------------------- 2 files changed, 26 deletions(-) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 2cdbfd5..e14aa01 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -6414,12 +6414,6 @@ typedef void cp_binding_oracle_function (enum cp_oracle_requ [...] extern cp_binding_oracle_function *cp_binding_oracle; -extern void cp_pushtag (location_t, tree, tree); -extern void cp_bind (location_t, tree, bool); - -/* In class.c */ -extern void cp_finish_injected_record_type (tree); - /* in vtable-class-hierarchy.c */ extern void vtv_compute_class_hierarchy_transitive_closure (void); extern void vtv_generate_init_routine (void); diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index dd757a3..81b31b4 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -6026,26 +6026,6 @@ pushtag (tree name, tree type, tag_scope scope) return ret; } -void -cp_bind (location_t loc, tree decl, bool is_global) -{ - DECL_SOURCE_LOCATION (decl) = loc; - - if (!is_global) - { - push_local_binding (DECL_NAME (decl), decl, 0); - return; - } - - /* Select the global namespace. */ - cp_binding_level *level = current_binding_level; - - while (level->level_chain) - level = level->level_chain; - - add_decl_to_level (decl, level); -} - /* Subroutines for reverting temporarily to top-level for instantiation of templates and such. We actually need to clear out the class- and -- To stop receiving notification emails like this one, please contact the administrator of this repository.

9 years, 3 months

[gcc] 09/20: Update libcp1plugin build_enumerator call to match cc1plus change.

by git

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch aoliva/libcp1 in repository gcc. commit a09ca4aeca283f0befd26bd3ddfc63c3e747488e Author: Alexandre Oliva <aoliva(a)redhat.com> Date: Tue Jun 9 03:31:34 2015 -0300 Update libcp1plugin build_enumerator call to match cc1plus change. --- libcc1/libcp1plugin.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc index 543dc4c..b0d1cb0 100644 --- a/libcc1/libcp1plugin.cc +++ b/libcc1/libcp1plugin.cc @@ -665,7 +665,7 @@ plugin_build_add_enum_constant (cc1_plugin::connection *, gcc_assert (TREE_CODE (enum_type) == ENUMERAL_TYPE); build_enumerator (get_identifier (name), build_int_cst (enum_type, value), - enum_type, BUILTINS_LOCATION); + enum_type, NULL_TREE, BUILTINS_LOCATION); return 1; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

9 years, 3 months

[gcc] 15/20: libcc1plugin: propagate record/union info to variants on finish and tagbind

by git

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch aoliva/libcp1 in repository gcc. commit 35000e6fb5d1f5a775c7b7ecf8f04c19e2d95840 Author: Alexandre Oliva <aoliva(a)redhat.com> Date: Fri Jul 3 07:26:12 2015 -0300 libcc1plugin: propagate record/union info to variants on finish and tagbind --- libcc1/libcc1plugin.cc | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/libcc1/libcc1plugin.cc b/libcc1/libcc1plugin.cc index 39aac4a..6f7b527 100644 --- a/libcc1/libcc1plugin.cc +++ b/libcc1/libcc1plugin.cc @@ -447,8 +447,15 @@ plugin_tagbind (cc1_plugin::connection *self, const char *filename, unsigned int line_number) { plugin_context *ctx = static_cast<plugin_context *> (self); + tree t = convert_in (tagged_type), x; c_pushtag (ctx->get_source_location (filename, line_number), - get_identifier (name), convert_in (tagged_type)); + get_identifier (name), t); + + /* Propagate the newly-added type name so that previously-created + variant types are not disconnected from their main variants. */ + for (x = TYPE_MAIN_VARIANT (t); x; x = TYPE_NEXT_VARIANT (x)) + TYPE_NAME (x) = TYPE_NAME (t); + return 1; } @@ -568,6 +575,23 @@ plugin_finish_record_or_union (cc1_plugin::connection *, // FIXME we have no idea about TYPE_PACKED } + tree t = record_or_union_type, x; + for (x = TYPE_MAIN_VARIANT (t); x; x = TYPE_NEXT_VARIANT (x)) + { + /* Like finish_struct, update the qualified variant types. */ + TYPE_FIELDS (x) = TYPE_FIELDS (t); + TYPE_LANG_SPECIFIC (x) = TYPE_LANG_SPECIFIC (t); + C_TYPE_FIELDS_READONLY (x) = C_TYPE_FIELDS_READONLY (t); + C_TYPE_FIELDS_VOLATILE (x) = C_TYPE_FIELDS_VOLATILE (t); + C_TYPE_VARIABLE_SIZE (x) = C_TYPE_VARIABLE_SIZE (t); + /* We copy these fields too. */ + TYPE_ALIGN (x) = TYPE_ALIGN (t); + TYPE_SIZE (x) = TYPE_SIZE (t); + TYPE_SIZE_UNIT (x) = TYPE_SIZE_UNIT (t); + if (x != record_or_union_type) + compute_record_mode (x); + } + return 1; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

9 years, 3 months

[gcc] 05/20: Fix unions (and structs), behaving more like the C++ parser

by git

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch aoliva/libcp1 in repository gcc. commit 9d8dd071b1ae448d6b6176d087f5943732640737 Author: Alexandre Oliva <aoliva(a)redhat.com> Date: Fri May 22 01:45:18 2015 -0300 Fix unions (and structs), behaving more like the C++ parser We enter the class/union scope at build_(record|union)_type, and leave it at finish_record_or_union. Ctors, dtors and the class name defined within the class name are probably not correctly defined because we're still using a placeholder name, but this will have to do for now. --- libcc1/libcp1plugin.cc | 50 +++++++++++++++----------------------------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc index f32a2f3..30f3a57 100644 --- a/libcc1/libcp1plugin.cc +++ b/libcc1/libcp1plugin.cc @@ -513,16 +513,23 @@ static tree build_anonymous_node (enum tree_code code) { tree node; - if (code == RECORD_TYPE) - node = make_class_type (code); + if (code != ENUMERAL_TYPE) + { + node = make_class_type (code); + } else - node = make_node (code); - if (!name_placeholder) + node = cxx_make_type (code); + if (!name_placeholder) // FIXME: have a separate call to set scope, name and bases name_placeholder = get_identifier ("name placeholder"); tree type_decl = build_decl (input_location, TYPE_DECL, name_placeholder, node); TYPE_NAME (node) = type_decl; TYPE_STUB_DECL (node) = type_decl; + if (code != ENUMERAL_TYPE) + { + xref_basetypes (node, NULL); + begin_class_definition (node); + } return node; } @@ -530,9 +537,7 @@ gcc_type plugin_build_record_type (cc1_plugin::connection *self) { plugin_context *ctx = static_cast<plugin_context *> (self); - tree node = build_anonymous_node (RECORD_TYPE); - xref_basetypes (node, NULL); // for now - return convert_out (ctx->preserve (node)); + return convert_out (ctx->preserve (build_anonymous_node (RECORD_TYPE))); } gcc_type @@ -553,8 +558,7 @@ plugin_build_add_field (cc1_plugin::connection *, tree record_or_union_type = convert_in (record_or_union_type_in); tree field_type = convert_in (field_type_in); - gcc_assert (TREE_CODE (record_or_union_type) == RECORD_TYPE - || TREE_CODE (record_or_union_type) == UNION_TYPE); + gcc_assert (RECORD_OR_UNION_CODE_P (TREE_CODE (record_or_union_type))); /* Note that gdb does not preserve the location of field decls, so we can't provide a decent location here. */ @@ -599,33 +603,9 @@ plugin_finish_record_or_union (cc1_plugin::connection *, { tree record_or_union_type = convert_in (record_or_union_type_in); - gcc_assert (TREE_CODE (record_or_union_type) == RECORD_TYPE - || TREE_CODE (record_or_union_type) == UNION_TYPE); - - /* We built the field list in reverse order, so fix it now. */ - TYPE_FIELDS (record_or_union_type) - = nreverse (TYPE_FIELDS (record_or_union_type)); + gcc_assert (RECORD_OR_UNION_CODE_P (TREE_CODE (record_or_union_type))); - if (TREE_CODE (record_or_union_type) == UNION_TYPE) - { - /* Unions can just be handled by the generic code. */ - layout_type (record_or_union_type); - } - else - { - // FIXME there's no way to get this from DWARF, - // or even, it seems, a particularly good way to deduce it. - TYPE_ALIGN (record_or_union_type) - = TYPE_PRECISION (pointer_sized_int_node); - - TYPE_SIZE (record_or_union_type) = bitsize_int (size_in_bytes - * BITS_PER_UNIT); - TYPE_SIZE_UNIT (record_or_union_type) = size_int (size_in_bytes); - - compute_record_mode (record_or_union_type); - finish_bitfield_layout (record_or_union_type); - // FIXME we have no idea about TYPE_PACKED - } + finish_struct (record_or_union_type, NULL); return 1; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

9 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Tcwg-commits July 2015