Merge pull request #3019 from diffblue/type-cleanup3

avoid direct access to subtypes

Author: tautschnig

src/ansi-c/c_typecheck_expr.cpp

@@ -233,7 +233,8 @@ void c_typecheck_baset::typecheck_expr_main(exprt &expr)
   else if(expr.id()==ID_gcc_builtin_types_compatible_p)
   {
     expr.type()=bool_typet();
-    typet::subtypest &subtypes=((typet &)(expr.add(ID_type_arg))).subtypes();
+    auto &subtypes =
+      (static_cast<type_with_subtypest &>(expr.add(ID_type_arg))).subtypes();
     assert(subtypes.size()==2);
     typecheck_type(subtypes[0]);
     typecheck_type(subtypes[1]);

src/ansi-c/parser.y

@@ -376,8 +376,8 @@ gcc_builtin_expressions:
         {
           $$=$1;
           stack($$).id(ID_gcc_builtin_types_compatible_p);
-          typet &type_arg=(typet &)(stack($$).add(ID_type_arg));
-          typet::subtypest &subtypes=type_arg.subtypes();
+          auto &type_arg=static_cast<type_with_subtypest &>(stack($$).add(ID_type_arg));
+          auto &subtypes=type_arg.subtypes();
           subtypes.resize(2);
           subtypes[0].swap(stack($3));
           subtypes[1].swap(stack($5));
@@ -1855,7 +1855,7 @@ parameter_type_list:
         {
           typet tmp(ID_ellipsis);
           $$=$1;
-          stack_type($$).move_to_subtypes(tmp);
+          to_type_with_subtypes(stack_type($$)).move_to_subtypes(tmp);
         }
         ;
 
@@ -3189,7 +3189,7 @@ postfixing_abstract_declarator:
           set($$, ID_code);
           stack_type($$).subtype()=typet(ID_abstract);
           stack_type($$).add(ID_parameters).get_sub().
-            swap((irept::subt &)(stack_type($3).subtypes()));
+            swap((irept::subt &)(to_type_with_subtypes(stack_type($3)).subtypes()));
           PARSER.pop_scope();
           adjust_KnR_parameters(stack($$).add(ID_parameters), stack($5));
           stack($$).set(ID_C_KnR, true);
@@ -3219,7 +3219,7 @@ parameter_postfixing_abstract_declarator:
           set($$, ID_code);
           stack_type($$).subtype()=typet(ID_abstract);
           stack_type($$).add(ID_parameters).get_sub().
-            swap((irept::subt &)(stack_type($3).subtypes()));
+            swap((irept::subt &)(to_type_with_subtypes(stack_type($3)).subtypes()));
           PARSER.pop_scope();
 
           if(stack($5).is_not_nil())

src/ansi-c/parser_static.inc

@@ -10,7 +10,7 @@
 #define YYSTYPE_IS_TRIVIAL 1
 
 #define mto(x, y) stack(x).move_to_operands(stack(y))
-#define mts(x, y) (stack_type(x).move_to_subtypes(stack_type(y)))
+#define mts(x, y) (to_type_with_subtypes(stack_type(x)).move_to_subtypes(stack_type(y)))
 #define binary(x, y, l, id, z) { init(x, id); \
   stack(x).add_source_location()=stack(l).source_location(); \
   stack(x).reserve_operands(2); mto(x, y); mto(x, z); }
@@ -123,7 +123,7 @@ static void merge_types(irept &dest, irept &src)
     static_cast<exprt &>(dest).add_source_location()=location;
   }
 
-  static_cast<typet &>(dest).move_to_subtypes(static_cast<typet &>(src));
+  to_type_with_subtypes(static_cast<typet &>(dest)).move_to_subtypes(static_cast<typet &>(src));
 }
 
 /*******************************************************************\

src/cpp/cpp_typecheck_constructor.cpp

@@ -229,7 +229,7 @@ void cpp_typecheckt::default_cpctor(
   // Parameter declaration
   cpp_declarationt parameter_decl;
   parameter_decl.set(ID_type, ID_merged_type);
-  typet::subtypest &sub=parameter_decl.type().subtypes();
+  auto &sub = to_type_with_subtypes(parameter_decl.type()).subtypes();
   sub.push_back(
     static_cast<const typet &>(static_cast<const irept &>(cppcomp)));
   irept constnd(ID_const);
@@ -397,7 +397,7 @@ void cpp_typecheckt::default_assignop(
   cpp_declarationt &args_decl=
     static_cast<cpp_declarationt&>(args.get_sub().back());
 
-  typet::subtypest &args_decl_type_sub=args_decl.type().subtypes();
+  auto &args_decl_type_sub = to_type_with_subtypes(args_decl.type()).subtypes();
 
   args_decl.type().id(ID_merged_type);
   args_decl_type_sub.push_back(typet(ID_cpp_name));

src/cpp/parse.cpp

@@ -480,7 +480,7 @@ void Parser::merge_types(const typet &src, typet &dest)
     // the end of the subtypes container needs to stay the same,
     // since several analysis functions traverse via the end for
     // merged_types
-    typet::subtypest &sub=dest.subtypes();
+    auto &sub = to_type_with_subtypes(dest).subtypes();
     sub.emplace(sub.begin(), src);
   }
 }

src/util/expr_util.cpp

@@ -181,7 +181,7 @@ bool has_subtype(
     }
     else
     {
-      for(const auto &subtype : top.subtypes())
+      for(const auto &subtype : to_type_with_subtypes(top).subtypes())
         push_if_not_visited(subtype);
     }
   }