2014-01-07 13:12:26 +00:00
|
|
|
<abi-instr version='1.0' path='data/test-read-write/test21.xml'>
|
Avoid missing member types while reading bi files
* include/abg-fwd.h (get_type_declaration): Declare function.
* include/abg-ir.h (class decl_base): Add class_decl as a friend.
This to be able to call decl_base::set_scope from class_decl.
(scope_decl::add_member_decl): Make this virtual protected, so
that it can be called (virtually) from e.g, class_decl.
(type_decl_sptr, typedef_decl_sptr): New convenience typedefs.
(class_decl::add_member_decl): New virtual overload for
scope_decl::add_member_decl.
(class_decl::{add_member_type, add_data_member,
add_member_function}): New overloads.
* src/abg-ir.cc (add_decl_to_scope): Benign style cleanup.
(get_type_declaration): Define new function.
(class_decl::add_member_decl): New method.
(class_decl::add_member_type): Avoid silently added a new member
type when that member type has already been (perhaps
inadvertently) added to a scope already. Rather, put a strict
assert in place there. Also add a new overload that constructs
the member type out of a classic type and adds it to the class.
(class_decl::{add_data_member, add_member_function}): Likewise.
(class_decl::{add_member_function_template,
add_member_class_template}): Avoid silently added a new member
template when that template has already been (perhaps
inadvertently) added to a scope already. Rather, put a strict
assert in place there.
* src/abg-reader.cc (push_decl_to_current_scope): Take a an extra
flag saying if the current decl should be added to the current
scope as well (in addition to being pushed onto the stack of
scopes maintained in the reader context).
(push_and_key_type_decl): Likewise, take that extra flag and pass
it to push_decl_to_current_scope.
(build_function_decl, build_var_decl, build_type_decl)
(build_qualified_type_decl, build_pointer_type_def)
(build_reference_type_def, build_enum_type_decl, build_typedef_decl)
(build_function_tdecl, build_class_tdecl): Likewise.
(build_class_decl): Likewise. When building member data, types,
and functions, make sure /not/ to add the data, type of function to
the current scope before adding it to the class_decl. This was
making the member not being added to the class because it already
had a scope.
(build_type_tparameter, build_type_composition)
(build_non_type_tparameter, build_template_tparameter)
(build_type): Adjust to add the template parm to the current scope
explicitly, like previously.
(handle_type_decl): Use build_type_decl function. Add the
type_decl to the current scope, like previously.
(handle_namespace_decl, handle_qualified_type_decl)
(handle_pointer_type_def, handle_reference_type_def)
(handle_enum_type_decl, handle_typedef_decl, handle_var_decl)
(handle_function_decl, handle_class_decl, handle_function_tdecl)
(handle_class_tdecl): Adjust to add the decl to the current scope,
like previously.
* tests/data/test-read-write/test21.xml: New test input with
member type(def).
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
2013-11-19 09:06:04 +00:00
|
|
|
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
|
|
|
|
|
<class-decl name='S' visibility='default' is-declaration-only='yes' id='type-id-2'/>
|
|
|
|
|
<pointer-type-def type-id='type-id-2' size-in-bits='64' alignment-in-bits='64' id='type-id-3'/>
|
|
|
|
|
<type-decl name='void' alignment-in-bits='8' id='type-id-4'/>
|
|
|
|
|
<qualified-type-def type-id='type-id-2' const='yes' filepath='simple-class-0.C' line='5' column='8' id='type-id-5'/>
|
|
|
|
|
<reference-type-def kind='lvalue' type-id='type-id-5' size-in-bits='64' alignment-in-bits='64' id='type-id-6'/>
|
|
|
|
|
<class-decl name='S' size-in-bits='32' alignment-in-bits='32' visibility='default' filepath='simple-class-0.C' line='5' column='8' def-of-decl-id='type-id-2' id='type-id-7'>
|
|
|
|
|
<member-type access='public'>
|
|
|
|
|
<typedef-decl name='S' type-id='type-id-2' filepath='simple-class-0.C' line='6' column='1' id='type-id-8'/>
|
|
|
|
|
</member-type>
|
|
|
|
|
<data-member access='public' layout-offset-in-bits='0'>
|
|
|
|
|
<var-decl name='m' type-id='type-id-1' visibility='default' filepath='simple-class-0.C' line='7' column='7'/>
|
|
|
|
|
</data-member>
|
|
|
|
|
<member-function access='public' constructor='yes'>
|
|
|
|
|
<function-decl name='__base_ctor ' mangled-name='_ZN1SC2Ev' filepath='simple-class-0.C' line='13' column='1' visibility='default' binding='global' size-in-bits='8' alignment-in-bits='8'>
|
|
|
|
|
<parameter type-id='type-id-3'/>
|
|
|
|
|
<return type-id='type-id-4'/>
|
|
|
|
|
</function-decl>
|
|
|
|
|
</member-function>
|
|
|
|
|
<member-function access='public' constructor='yes'>
|
|
|
|
|
<function-decl name='__comp_ctor ' mangled-name='_ZN1SC1Ev' filepath='simple-class-0.C' line='13' column='1' visibility='default' binding='global' size-in-bits='8' alignment-in-bits='8'>
|
|
|
|
|
<parameter type-id='type-id-3'/>
|
|
|
|
|
<return type-id='type-id-4'/>
|
|
|
|
|
</function-decl>
|
|
|
|
|
</member-function>
|
|
|
|
|
<member-function access='public' constructor='yes'>
|
|
|
|
|
<function-decl name='__base_ctor ' mangled-name='_ZN1SC2ERKS_' filepath='simple-class-0.C' line='18' column='1' visibility='default' binding='global' size-in-bits='8' alignment-in-bits='8'>
|
|
|
|
|
<parameter type-id='type-id-3'/>
|
|
|
|
|
<parameter type-id='type-id-6'/>
|
|
|
|
|
<return type-id='type-id-4'/>
|
|
|
|
|
</function-decl>
|
|
|
|
|
</member-function>
|
|
|
|
|
<member-function access='public' constructor='yes'>
|
|
|
|
|
<function-decl name='__comp_ctor ' mangled-name='_ZN1SC1ERKS_' filepath='simple-class-0.C' line='18' column='1' visibility='default' binding='global' size-in-bits='8' alignment-in-bits='8'>
|
|
|
|
|
<parameter type-id='type-id-3'/>
|
|
|
|
|
<parameter type-id='type-id-6'/>
|
|
|
|
|
<return type-id='type-id-4'/>
|
|
|
|
|
</function-decl>
|
|
|
|
|
</member-function>
|
|
|
|
|
</class-decl>
|
|
|
|
|
<reference-type-def kind='lvalue' type-id='type-id-7' size-in-bits='64' alignment-in-bits='64' id='type-id-9'/>
|
|
|
|
|
<function-decl name='foo' mangled-name='_Z3fooR1S' filepath='simple-class-0.C' line='24' column='1' visibility='default' binding='global' size-in-bits='8' alignment-in-bits='8'>
|
|
|
|
|
<parameter type-id='type-id-9'/>
|
|
|
|
|
<return type-id='type-id-4'/>
|
|
|
|
|
</function-decl>
|
|
|
|
|
</abi-instr>
|