diff options
| author | Jason Merrill <jason@redhat.com> | 2014-06-12 16:47:08 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-06-12 16:47:08 -0400 |
| commit | 90d8493479eebfa2df08f6462f5972887a330138 (patch) | |
| tree | fb6c67f9fd779411a8cc1494ddd0c7961d42676d /gcc/cp/rtti.c | |
| parent | 8fdcb6a997e7125d155b79947a1793f01611527b (diff) | |
| download | gcc-90d8493479eebfa2df08f6462f5972887a330138.zip gcc-90d8493479eebfa2df08f6462f5972887a330138.tar.gz gcc-90d8493479eebfa2df08f6462f5972887a330138.tar.bz2 | |
toplev.c (process_options): Reject -fabi-version=1.
gcc/
* toplev.c (process_options): Reject -fabi-version=1.
gcc/cp/
* call.c (build_operator_new_call): Remove -fabi-version=1 support.
* class.c (walk_subobject_offsets, include_empty_classes): Likewise.
(layout_nonempty_base_or_field, end_of_class): Likewise.
(layout_empty_base, build_base_field, layout_class_type): Likewise.
(is_empty_class, add_vcall_offset_vtbl_entries_1): Likewise.
(layout_virtual_bases): Likewise.
* decl.c (compute_array_index_type): Likewise.
* mangle.c (write_mangled_name, write_prefix): Likewise.
(write_template_prefix, write_integer_cst, write_expression): Likewise.
(write_template_arg, write_array_type): Likewise.
* method.c (lazily_declare_fn): Likewise.
* rtti.c (get_pseudo_ti_index): Likewise.
* typeck.c (comp_array_types): Likewise.
From-SVN: r211592
Diffstat (limited to 'gcc/cp/rtti.c')
| -rw-r--r-- | gcc/cp/rtti.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index b665a8d..10cc168 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -1331,14 +1331,8 @@ get_pseudo_ti_index (tree type) /* already created. */ break; - /* Create the array of __base_class_type_info entries. - G++ 3.2 allocated an array that had one too many - entries, and then filled that extra entries with - zeros. */ - if (abi_version_at_least (2)) - array_domain = build_index_type (size_int (num_bases - 1)); - else - array_domain = build_index_type (size_int (num_bases)); + /* Create the array of __base_class_type_info entries. */ + array_domain = build_index_type (size_int (num_bases - 1)); base_array = build_array_type ((*tinfo_descs)[TK_BASE_TYPE].type, array_domain); |