Skip to content

Commit 2b2fd14

Browse files
tautschnigtautschnig
committed
C++ front-end: Replace uses of namespacet::follow
This is deprecated. Use suitable variants of `follow_tag` instead. Also fixes cases that used the full type when we should be using a tag type instead.
1 parent bf29f34 commit 2b2fd14

12 files changed

+283
-209
lines changed

‎src/cpp/cpp_constructor.cpp‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ std::optional<codet> cpp_typecheckt::cpp_constructor(
3030

3131
elaborate_class_template(object_tc.type());
3232

33-
typet tmp_type(follow(object_tc.type()));
34-
CHECK_RETURN(!is_reference(tmp_type));
33+
CHECK_RETURN(!is_reference(object_tc.type()));
3534

36-
if(tmp_type.id()==ID_array)
35+
if(object_tc.type().id() == ID_array)
3736
{
3837
// We allow only one operand and it must be tagged with '#array_ini'.
3938
// Note that the operand is an array that is used for copy-initialization.
@@ -53,11 +52,10 @@ std::optional<codet> cpp_typecheckt::cpp_constructor(
5352
operands.empty() || operands.size() == 1,
5453
"array constructor must have at most one operand");
5554

56-
if(operands.empty() && cpp_is_pod(tmp_type))
55+
if(operands.empty() && cpp_is_pod(object_tc.type()))
5756
return {};
5857

59-
const exprt &size_expr=
60-
to_array_type(tmp_type).size();
58+
const exprt &size_expr = to_array_type(object_tc.type()).size();
6159

6260
if(size_expr.id() == ID_infinity)
6361
return {}; // don't initialize
@@ -74,7 +72,7 @@ std::optional<codet> cpp_typecheckt::cpp_constructor(
7472
throw 0;
7573
}
7674

77-
/*if(cpp_is_pod(tmp_type))
75+
/*if(cpp_is_pod(object_tc.type()))
7876
{
7977
code_expressiont new_code;
8078
exprt op_tc=operands.front();
@@ -119,7 +117,7 @@ std::optional<codet> cpp_typecheckt::cpp_constructor(
119117
return std::move(new_code);
120118
}
121119
}
122-
else if(cpp_is_pod(tmp_type))
120+
else if(cpp_is_pod(object_tc.type()))
123121
{
124122
exprt::operandst operands_tc=operands;
125123

@@ -152,11 +150,11 @@ std::optional<codet> cpp_typecheckt::cpp_constructor(
152150
throw 0;
153151
}
154152
}
155-
else if(tmp_type.id()==ID_union)
153+
else if(object_tc.type().id() == ID_union_tag)
156154
{
157155
UNREACHABLE; // Todo: union
158156
}
159-
else if(tmp_type.id()==ID_struct)
157+
else if(object_tc.type().id() == ID_struct_tag)
160158
{
161159
exprt::operandst operands_tc=operands;
162160

@@ -166,8 +164,8 @@ std::optional<codet> cpp_typecheckt::cpp_constructor(
166164
add_implicit_dereference(op);
167165
}
168166

169-
const struct_typet &struct_type=
170-
to_struct_type(tmp_type);
167+
const struct_typet &struct_type =
168+
follow_tag(to_struct_tag_type(object_tc.type()));
171169

172170
// set most-derived bits
173171
code_blockt block;

‎src/cpp/cpp_destructor.cpp‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,15 @@ std::optional<codet> cpp_typecheckt::cpp_destructor(
2222
{
2323
elaborate_class_template(object.type());
2424

25-
typet tmp_type(follow(object.type()));
26-
CHECK_RETURN(!is_reference(tmp_type));
25+
CHECK_RETURN(!is_reference(object.type()));
2726

2827
// PODs don't need a destructor
29-
if(cpp_is_pod(tmp_type))
28+
if(cpp_is_pod(object.type()))
3029
return {};
3130

32-
if(tmp_type.id()==ID_array)
31+
if(object.type().id() == ID_array)
3332
{
34-
const exprt &size_expr=
35-
to_array_type(tmp_type).size();
33+
const exprt &size_expr = to_array_type(object.type()).size();
3634

3735
if(size_expr.id() == ID_infinity)
3836
return {}; // don't initialize
@@ -70,8 +68,8 @@ std::optional<codet> cpp_typecheckt::cpp_destructor(
7068
}
7169
else
7270
{
73-
const struct_typet &struct_type=
74-
to_struct_type(tmp_type);
71+
const struct_typet &struct_type =
72+
follow_tag(to_struct_tag_type(object.type()));
7573

7674
// enter struct scope
7775
cpp_save_scopet save_scope(cpp_scopes);

‎src/cpp/cpp_typecheck.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ const struct_typet &cpp_typecheckt::this_struct_type()
6767
CHECK_RETURN(this_expr.is_not_nil());
6868
CHECK_RETURN(this_expr.type().id() == ID_pointer);
6969

70-
const typet &t = follow(to_pointer_type(this_expr.type()).base_type());
71-
CHECK_RETURN(t.id() == ID_struct);
72-
return to_struct_type(t);
70+
const typet &t = to_pointer_type(this_expr.type()).base_type();
71+
CHECK_RETURN(t.id() == ID_struct_tag);
72+
return follow_tag(to_struct_tag_type(t));
7373
}
7474

7575
std::string cpp_typecheckt::to_string(const exprt &expr)

‎src/cpp/cpp_typecheck_code.cpp‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
99
/// \file
1010
/// C++ Language Type Checking
1111

12-
#include "cpp_typecheck.h"
13-
1412
#include <util/arith_tools.h>
1513
#include <util/bitvector_expr.h>
14+
#include <util/c_types.h>
1615
#include <util/pointer_expr.h>
1716
#include <util/source_location.h>
1817

1918
#include "cpp_declarator_converter.h"
2019
#include "cpp_exception_id.h"
20+
#include "cpp_typecheck.h"
2121
#include "cpp_typecheck_fargs.h"
2222
#include "cpp_util.h"
2323

@@ -421,8 +421,13 @@ void cpp_typecheckt::typecheck_decl(codet &code)
421421

422422
CHECK_RETURN(type.is_not_nil());
423423

424-
if(declaration.declarators().empty() &&
425-
follow(type).get_bool(ID_C_is_anonymous))
424+
if(
425+
declaration.declarators().empty() &&
426+
((type.id() == ID_struct_tag &&
427+
follow_tag(to_struct_tag_type(type)).get_bool(ID_C_is_anonymous)) ||
428+
(type.id() == ID_union_tag &&
429+
follow_tag(to_union_tag_type(type)).get_bool(ID_C_is_anonymous)) ||
430+
type.get_bool(ID_C_is_anonymous)))
426431
{
427432
if(type.id() != ID_union_tag)
428433
{
@@ -470,8 +475,7 @@ void cpp_typecheckt::typecheck_decl(codet &code)
470475
{
471476
decl_statement.copy_to_operands(symbol.value);
472477
DATA_INVARIANT(
473-
has_auto(symbol.type) ||
474-
follow(decl_statement.op1().type()) == follow(symbol.type),
478+
has_auto(symbol.type) || decl_statement.op1().type() == symbol.type,
475479
"declarator type should match symbol type");
476480
}
477481

‎src/cpp/cpp_typecheck_compound_type.cpp‎

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,15 +1019,21 @@ void cpp_typecheckt::typecheck_compound_body(symbolt &symbol)
10191019
throw 0;
10201020
}
10211021

1022-
typet final_type=follow(declaration.type());
1023-
10241022
// anonymous member?
1025-
if(declaration.declarators().empty() &&
1026-
final_type.get_bool(ID_C_is_anonymous))
1023+
if(
1024+
declaration.declarators().empty() &&
1025+
((declaration.type().id() == ID_struct_tag &&
1026+
follow_tag(to_struct_tag_type(declaration.type()))
1027+
.get_bool(ID_C_is_anonymous)) ||
1028+
(declaration.type().id() == ID_union_tag &&
1029+
follow_tag(to_union_tag_type(declaration.type()))
1030+
.get_bool(ID_C_is_anonymous)) ||
1031+
declaration.type().get_bool(ID_C_is_anonymous)))
10271032
{
10281033
// we only allow this on struct/union types
1029-
if(final_type.id()!=ID_union &&
1030-
final_type.id()!=ID_struct)
1034+
if(
1035+
declaration.type().id() != ID_union_tag &&
1036+
declaration.type().id() != ID_struct_tag)
10311037
{
10321038
error().source_location=declaration.type().source_location();
10331039
error() << "member declaration does not declare anything"
@@ -1423,8 +1429,14 @@ void cpp_typecheckt::convert_anon_struct_union_member(
14231429
const irep_idt &access,
14241430
struct_typet::componentst &components)
14251431
{
1432+
const struct_union_typet &final_type =
1433+
declaration.type().id() == ID_struct_tag
1434+
? static_cast<const struct_union_typet &>(
1435+
follow_tag(to_struct_tag_type(declaration.type())))
1436+
: static_cast<const struct_union_typet &>(
1437+
follow_tag(to_union_tag_type(declaration.type())));
14261438
symbolt &struct_union_symbol =
1427-
symbol_table.get_writeable_ref(follow(declaration.type()).get(ID_name));
1439+
symbol_table.get_writeable_ref(final_type.get(ID_name));
14281440

14291441
if(declaration.storage_spec().is_static() ||
14301442
declaration.storage_spec().is_mutable())
@@ -1477,13 +1489,15 @@ bool cpp_typecheckt::get_component(
14771489
const irep_idt &component_name,
14781490
exprt &member)
14791491
{
1480-
const typet &followed_type=follow(object.type());
1481-
14821492
PRECONDITION(
1483-
followed_type.id() == ID_struct || followed_type.id() == ID_union);
1493+
object.type().id() == ID_struct_tag || object.type().id() == ID_union_tag);
14841494

1485-
struct_union_typet final_type=
1486-
to_struct_union_type(followed_type);
1495+
struct_union_typet final_type =
1496+
object.type().id() == ID_struct_tag
1497+
? static_cast<const struct_union_typet &>(
1498+
follow_tag(to_struct_tag_type(object.type())))
1499+
: static_cast<const struct_union_typet &>(
1500+
follow_tag(to_union_tag_type(object.type())));
14871501

14881502
const struct_union_typet::componentst &components=
14891503
final_type.components();
@@ -1529,14 +1543,22 @@ bool cpp_typecheckt::get_component(
15291543

15301544
return true; // component found
15311545
}
1532-
else if(follow(component.type()).find(ID_C_unnamed_object).is_not_nil())
1546+
else if(
1547+
(component.type().id() == ID_struct_tag &&
1548+
follow_tag(to_struct_tag_type(component.type()))
1549+
.find(ID_C_unnamed_object)
1550+
.is_not_nil()) ||
1551+
(component.type().id() == ID_union_tag &&
1552+
follow_tag(to_union_tag_type(component.type()))
1553+
.find(ID_C_unnamed_object)
1554+
.is_not_nil()) ||
1555+
component.type().find(ID_C_unnamed_object).is_not_nil())
15331556
{
15341557
// could be anonymous union or struct
15351558

1536-
const typet &component_type=follow(component.type());
1537-
1538-
if(component_type.id()==ID_union ||
1539-
component_type.id()==ID_struct)
1559+
if(
1560+
component.type().id() == ID_union_tag ||
1561+
component.type().id() == ID_struct_tag)
15401562
{
15411563
// recursive call!
15421564
if(get_component(source_location, tmp, component_name, member))
@@ -1686,11 +1708,11 @@ void cpp_typecheckt::make_ptr_typecast(
16861708

16871709
PRECONDITION(src_type.id() == ID_pointer);
16881710

1689-
const struct_typet &src_struct = to_struct_type(
1690-
static_cast<const typet &>(follow(to_pointer_type(src_type).base_type())));
1711+
const struct_typet &src_struct =
1712+
follow_tag(to_struct_tag_type(to_pointer_type(src_type).base_type()));
16911713

16921714
const struct_typet &dest_struct =
1693-
to_struct_type(static_cast<const typet &>(follow(dest_type.base_type())));
1715+
follow_tag(to_struct_tag_type(dest_type.base_type()));
16941716

16951717
PRECONDITION(
16961718
subtype_typecast(src_struct, dest_struct) ||

0 commit comments

Comments
 (0)