Skip to content

Use struct tags #2926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 20, 2018
Merged

Use struct tags #2926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
424569f
further support for struct/union tags
Sep 9, 2018
8e6ed7d
retain union/struct tag type during initialization
Sep 19, 2018
04c26c4
introduce struct tag types
Sep 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/ansi-c/c_typecheck_code.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,12 @@ bool c_typecheck_baset::is_complete_type(const typet &type) const
}
else if(type.id()==ID_vector)
return is_complete_type(type.subtype());
else if(type.id() == ID_symbol_type)
else if(
type.id() == ID_symbol_type || type.id() == ID_struct_tag ||
type.id() == ID_union_tag)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add braces around the (one-line) body for readability.

{
return is_complete_type(follow(type));
}

return true;
}
Expand Down
21 changes: 10 additions & 11 deletions src/ansi-c/c_typecheck_type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,18 +822,17 @@ void c_typecheck_baset::typecheck_compound_type(struct_union_typet &type)

c_qualifierst original_qualifiers(type);

if(type.id() == ID_union)
{
union_tag_typet tag_type(identifier);
tag_type.add_source_location() = type.source_location();
type.swap(tag_type);
}
typet tag_type;

if(type.id() == ID_union || type.id() == ID_incomplete_union)
tag_type = union_tag_typet(identifier);
else if(type.id() == ID_struct || type.id() == ID_incomplete_struct)
tag_type = struct_tag_typet(identifier);
else
{
symbol_typet symbol_type(identifier);
symbol_type.add_source_location() = type.source_location();
type.swap(symbol_type);
}
UNREACHABLE;

tag_type.add_source_location() = type.source_location();
type.swap(tag_type);

original_qualifiers.write(type);
}
Expand Down
16 changes: 12 additions & 4 deletions src/goto-instrument/dump_c.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,12 @@ void dump_ct::convert_compound(
if(!system_symbols.is_symbol_internal_symbol(symbol, system_headers))
convert_compound(symbol.type, unresolved, recursive, os);
}
else if(type.id()==ID_c_enum_tag)
else if(
type.id() == ID_c_enum_tag || type.id() == ID_struct_tag ||
type.id() == ID_union_tag)
{
const symbolt &symbol=
ns.lookup(to_c_enum_tag_type(type).get_identifier());
DATA_INVARIANT(symbol.is_type, "symbol expected to be type symbol");
const symbolt &symbol = ns.lookup(to_tag_type(type));
DATA_INVARIANT(symbol.is_type, "tag expected to be type symbol");

if(!system_symbols.is_symbol_internal_symbol(symbol, system_headers))
convert_compound(symbol.type, unresolved, recursive, os);
Expand Down Expand Up @@ -674,6 +675,13 @@ void dump_ct::collect_typedefs_rec(
ns.lookup(to_symbol_type(type).get_identifier());
collect_typedefs_rec(symbol.type, early, local_deps);
}
else if(
type.id() == ID_c_enum_tag || type.id() == ID_struct_tag ||
type.id() == ID_union_tag)
{
const symbolt &symbol = ns.lookup(to_tag_type(type));
collect_typedefs_rec(symbol.type, early, local_deps);
}

const irep_idt &typedef_str=type.get(ID_C_typedef);

Expand Down
22 changes: 14 additions & 8 deletions src/util/expr_initializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,17 +291,23 @@ exprt expr_initializert<nondet>::expr_initializer_rec(
}
else if(type_id==ID_struct_tag)
{
return
expr_initializer_rec(
ns.follow_tag(to_struct_tag_type(type)),
source_location);
exprt result = expr_initializer_rec(
ns.follow_tag(to_struct_tag_type(type)), source_location);

// use the tag type
result.type() = type;

return result;
}
else if(type_id==ID_union_tag)
{
return
expr_initializer_rec(
ns.follow_tag(to_union_tag_type(type)),
source_location);
exprt result = expr_initializer_rec(
ns.follow_tag(to_union_tag_type(type)), source_location);

// use the tag type
result.type() = type;

return result;
}
else if(type_id==ID_string)
{
Expand Down
4 changes: 3 additions & 1 deletion src/util/std_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,9 @@ bool is_constant_or_has_constant_components(
// we have to use the namespace to resolve to its definition:
// struct t { const int a; };
// struct t t1;
if(type.id() == ID_symbol_type)
if(type.id() == ID_symbol_type ||
type.id() == ID_struct_tag ||
type.id() == ID_union_tag)
{
const auto &resolved_type = ns.follow(type);
return has_constant_components(resolved_type);
Expand Down