Merge pull request #7364 from martin-cs/tidy/vsd-internals-1

martin-cs · web-flow · commit caf5b945dad5 · 2023-01-31T12:01:27.000Z
Remove an unused constructor from the interface of abstract_objectt
diff --git a/src/analyses/variable-sensitivity/abstract_aggregate_object.h b/src/analyses/variable-sensitivity/abstract_aggregate_object.h
@@ -30,12 +30,6 @@ class abstract_aggregate_objectt : public abstract_objectt,
                                    public abstract_aggregate_tag
 {
 public:
-  explicit abstract_aggregate_objectt(const typet &type)
-    : abstract_objectt(type)
-  {
-    PRECONDITION(type.id() == aggregate_traitst::TYPE_ID());
-  }
-
   abstract_aggregate_objectt(const typet &type, bool tp, bool bttm)
     : abstract_objectt(type, tp, bttm)
   {
diff --git a/src/analyses/variable-sensitivity/abstract_object.cpp b/src/analyses/variable-sensitivity/abstract_object.cpp
@@ -16,11 +16,6 @@
 
 #include "abstract_object.h"
 
-abstract_objectt::abstract_objectt(const typet &type)
-  : t(type), bottom(false), top(true)
-{
-}
-
 abstract_objectt::abstract_objectt(const typet &type, bool top, bool bottom)
   : t(type), bottom(bottom), top(top)
 {
@@ -35,15 +30,6 @@ abstract_objectt::abstract_objectt(
 {
 }
 
-abstract_objectt::abstract_objectt(
-  const typet &type,
-  const exprt &expr,
-  const abstract_environmentt &environment,
-  const namespacet &ns)
-  : t(type), bottom(false), top(true)
-{
-}
-
 const typet &abstract_objectt::type() const
 {
   return t;
diff --git a/src/analyses/variable-sensitivity/abstract_object.h b/src/analyses/variable-sensitivity/abstract_object.h
@@ -72,9 +72,6 @@ using abstract_object_visitedt = std::set<abstract_object_pointert>;
 class abstract_objectt : public std::enable_shared_from_this<abstract_objectt>
 {
 public:
-  /// \param type: the type the abstract_object is representing
-  explicit abstract_objectt(const typet &type);
-
   /// Start the abstract object at either top or bottom or neither
   /// Asserts if both top and bottom are true
   ///
@@ -95,19 +92,6 @@ class abstract_objectt : public std::enable_shared_from_this<abstract_objectt>
     const abstract_environmentt &environment,
     const namespacet &ns);
 
-  /// Ctor for building object of types that differ from the types of input
-  /// expressions
-  ///
-  /// \param type explicitly declared type the resulting object should have
-  /// \param expr expression used to build the object
-  /// \param environment abstract environment to evaluate the expression
-  /// \param ns namespace to uncover names inside the expression
-  abstract_objectt(
-    const typet &type,
-    const exprt &expr,
-    const abstract_environmentt &environment,
-    const namespacet &ns);
-
   virtual ~abstract_objectt()
   {
   }
diff --git a/src/analyses/variable-sensitivity/abstract_pointer_object.cpp b/src/analyses/variable-sensitivity/abstract_pointer_object.cpp
@@ -13,12 +13,6 @@
 
 #include "abstract_object_statistics.h"
 
-abstract_pointer_objectt::abstract_pointer_objectt(const typet &t)
-  : abstract_objectt(t)
-{
-  PRECONDITION(t.id() == ID_pointer);
-}
-
 abstract_pointer_objectt::abstract_pointer_objectt(
   const typet &type,
   bool top,
diff --git a/src/analyses/variable-sensitivity/abstract_pointer_object.h b/src/analyses/variable-sensitivity/abstract_pointer_object.h
@@ -21,9 +21,6 @@ class abstract_pointer_objectt : public abstract_objectt,
                                  public abstract_pointer_tag
 {
 public:
-  /// \param type: the type the abstract_object is representing
-  explicit abstract_pointer_objectt(const typet &type);
-
   /// Start the abstract object at either top or bottom or neither
   /// Asserts if both top and bottom are true
   ///
diff --git a/src/analyses/variable-sensitivity/abstract_value_object.h b/src/analyses/variable-sensitivity/abstract_value_object.h
@@ -240,10 +240,6 @@ class abstract_value_objectt : public abstract_objectt,
                                public abstract_value_tag
 {
 public:
-  explicit abstract_value_objectt(const typet &type) : abstract_objectt(type)
-  {
-  }
-
   abstract_value_objectt(const typet &type, bool tp, bool bttm)
     : abstract_objectt(type, tp, bttm)
   {
diff --git a/src/analyses/variable-sensitivity/constant_abstract_value.cpp b/src/analyses/variable-sensitivity/constant_abstract_value.cpp
@@ -37,11 +37,6 @@ make_constant_index_range(const exprt &val)
   return util_make_unique<constant_index_ranget>(val);
 }
 
-constant_abstract_valuet::constant_abstract_valuet(const typet &t)
-  : abstract_value_objectt(t), value()
-{
-}
-
 constant_abstract_valuet::constant_abstract_valuet(const exprt &e)
   : abstract_value_objectt(e.type(), false, false), value(e)
 {
diff --git a/src/analyses/variable-sensitivity/constant_abstract_value.h b/src/analyses/variable-sensitivity/constant_abstract_value.h
@@ -19,7 +19,6 @@
 class constant_abstract_valuet : public abstract_value_objectt
 {
 public:
-  explicit constant_abstract_valuet(const typet &t);
   explicit constant_abstract_valuet(const exprt &t);
   constant_abstract_valuet(const typet &t, bool tp, bool bttm);
   constant_abstract_valuet(
diff --git a/src/analyses/variable-sensitivity/constant_pointer_abstract_object.cpp b/src/analyses/variable-sensitivity/constant_pointer_abstract_object.cpp
@@ -20,13 +20,6 @@
 
 #include <ostream>
 
-constant_pointer_abstract_objectt::constant_pointer_abstract_objectt(
-  const typet &type)
-  : abstract_pointer_objectt(type)
-{
-  PRECONDITION(type.id() == ID_pointer);
-}
-
 constant_pointer_abstract_objectt::constant_pointer_abstract_objectt(
   const typet &type,
   bool top,
diff --git a/src/analyses/variable-sensitivity/constant_pointer_abstract_object.h b/src/analyses/variable-sensitivity/constant_pointer_abstract_object.h
@@ -23,9 +23,6 @@ class constant_pointer_abstract_objectt : public abstract_pointer_objectt
     constant_pointer_abstract_pointert;
 
 public:
-  /// \param type: the type the abstract_object is representing
-  explicit constant_pointer_abstract_objectt(const typet &type);
-
   /// \param type: the type the abstract_object is representing
   /// \param top: is the abstract_object starting as top
   /// \param bottom: is the abstract_object starting as bottom
diff --git a/src/analyses/variable-sensitivity/context_abstract_object.h b/src/analyses/variable-sensitivity/context_abstract_object.h
@@ -23,14 +23,6 @@ class context_abstract_objectt : public abstract_objectt
 public:
   // These constructors mirror those in the base abstract_objectt, but with
   // the addition of an extra argument which is the abstract_objectt to wrap.
-  explicit context_abstract_objectt(
-    const abstract_object_pointert child,
-    const typet &type)
-    : abstract_objectt(type)
-  {
-    child_abstract_object = child;
-  }
-
   context_abstract_objectt(
     const abstract_object_pointert child,
     const typet &type,
diff --git a/src/analyses/variable-sensitivity/data_dependency_context.h b/src/analyses/variable-sensitivity/data_dependency_context.h
@@ -21,13 +21,6 @@ class data_dependency_contextt : public write_location_contextt
 public:
   // These constructors mirror those in the base abstract_objectt, but with
   // the addition of an extra argument which is the abstract_objectt to wrap.
-  explicit data_dependency_contextt(
-    const abstract_object_pointert child,
-    const typet &type)
-    : write_location_contextt(child, type)
-  {
-  }
-
   data_dependency_contextt(
     const abstract_object_pointert child,
     const typet &type,
diff --git a/src/analyses/variable-sensitivity/full_array_abstract_object.cpp b/src/analyses/variable-sensitivity/full_array_abstract_object.cpp
@@ -64,12 +64,6 @@ abstract_object_pointert apply_to_index_range(
   return result;
 }
 
-full_array_abstract_objectt::full_array_abstract_objectt(typet type)
-  : abstract_aggregate_baset(type)
-{
-  DATA_INVARIANT(verify(), "Structural invariants maintained");
-}
-
 full_array_abstract_objectt::full_array_abstract_objectt(
   typet type,
   bool top,
diff --git a/src/analyses/variable-sensitivity/full_array_abstract_object.h b/src/analyses/variable-sensitivity/full_array_abstract_object.h
@@ -29,9 +29,6 @@ class full_array_abstract_objectt : public abstract_aggregate_objectt<
     array_aggregate_typet>
     abstract_aggregate_baset;
 
-  /// \param type: the type the abstract_object is representing
-  explicit full_array_abstract_objectt(typet type);
-
   /// Start the abstract object at either top or bottom or neither
   /// Asserts if both top and bottom are true
   ///
diff --git a/src/analyses/variable-sensitivity/full_struct_abstract_object.cpp b/src/analyses/variable-sensitivity/full_struct_abstract_object.cpp
@@ -27,13 +27,6 @@ full_struct_abstract_objectt::full_struct_abstract_objectt(
 {
 }
 
-full_struct_abstract_objectt::full_struct_abstract_objectt(const typet &t)
-  : abstract_aggregate_baset(t)
-{
-  PRECONDITION(t.id() == ID_struct);
-  DATA_INVARIANT(verify(), "Structural invariants maintained");
-}
-
 full_struct_abstract_objectt::full_struct_abstract_objectt(
   const typet &t,
   bool top,
diff --git a/src/analyses/variable-sensitivity/full_struct_abstract_object.h b/src/analyses/variable-sensitivity/full_struct_abstract_object.h
@@ -33,9 +33,6 @@ class full_struct_abstract_objectt : public abstract_aggregate_objectt<
    */
   full_struct_abstract_objectt(const full_struct_abstract_objectt &ao);
 
-  /// \param type: the type the abstract_object is representing
-  explicit full_struct_abstract_objectt(const typet &type);
-
   /// Start the abstract object at either top or bottom or
   /// neither asserts if both top and bottom are true
   ///
diff --git a/src/analyses/variable-sensitivity/interval_abstract_value.cpp b/src/analyses/variable-sensitivity/interval_abstract_value.cpp
@@ -224,11 +224,6 @@ static inline constant_interval_exprt interval_from_relation(const exprt &e)
     the_constant_part_of_the_relation, the_constant_part_of_the_relation);
 }
 
-interval_abstract_valuet::interval_abstract_valuet(const typet &t)
-  : abstract_value_objectt(t), interval(t)
-{
-}
-
 interval_abstract_valuet::interval_abstract_valuet(
   const typet &t,
   bool tp,
diff --git a/src/analyses/variable-sensitivity/interval_abstract_value.h b/src/analyses/variable-sensitivity/interval_abstract_value.h
@@ -21,7 +21,6 @@
 class interval_abstract_valuet : public abstract_value_objectt
 {
 public:
-  explicit interval_abstract_valuet(const typet &t);
   interval_abstract_valuet(const typet &t, bool tp, bool bttm);
 
   explicit interval_abstract_valuet(const constant_interval_exprt &e);
diff --git a/src/analyses/variable-sensitivity/liveness_context.h b/src/analyses/variable-sensitivity/liveness_context.h
@@ -33,13 +33,6 @@
 class liveness_contextt : public write_location_contextt
 {
 public:
-  explicit liveness_contextt(
-    const abstract_object_pointert child,
-    const typet &type)
-    : write_location_contextt(child, type)
-  {
-  }
-
   liveness_contextt(
     const abstract_object_pointert child,
     const typet &type,
diff --git a/src/analyses/variable-sensitivity/two_value_array_abstract_object.h b/src/analyses/variable-sensitivity/two_value_array_abstract_object.h
@@ -24,10 +24,6 @@ class two_value_array_abstract_objectt : public abstract_aggregate_objectt<
     array_aggregate_typet>
     abstract_aggregate_baset;
 
-  explicit two_value_array_abstract_objectt(const typet &type)
-    : abstract_aggregate_baset(type)
-  {
-  }
   two_value_array_abstract_objectt(const typet &type, bool top, bool bottom)
     : abstract_aggregate_baset(type, top, bottom)
   {
diff --git a/src/analyses/variable-sensitivity/two_value_pointer_abstract_object.cpp b/src/analyses/variable-sensitivity/two_value_pointer_abstract_object.cpp
@@ -11,12 +11,6 @@
 
 #include <util/pointer_expr.h>
 
-two_value_pointer_abstract_objectt::two_value_pointer_abstract_objectt(
-  const typet &type)
-  : abstract_pointer_objectt(type)
-{
-}
-
 two_value_pointer_abstract_objectt::two_value_pointer_abstract_objectt(
   const typet &type,
   bool top,
diff --git a/src/analyses/variable-sensitivity/two_value_pointer_abstract_object.h b/src/analyses/variable-sensitivity/two_value_pointer_abstract_object.h
@@ -13,9 +13,6 @@
 class two_value_pointer_abstract_objectt : public abstract_pointer_objectt
 {
 public:
-  /// \param type: the type the abstract_object is representing
-  explicit two_value_pointer_abstract_objectt(const typet &type);
-
   /// Start the abstract object at either top or bottom or neither
   /// Asserts if both top and bottom are true
   ///
diff --git a/src/analyses/variable-sensitivity/two_value_struct_abstract_object.h b/src/analyses/variable-sensitivity/two_value_struct_abstract_object.h
@@ -24,10 +24,6 @@ class two_value_struct_abstract_objectt : public abstract_aggregate_objectt<
     struct_aggregate_typet>
     abstract_aggregate_baset;
 
-  explicit two_value_struct_abstract_objectt(const typet &type)
-    : abstract_aggregate_baset(type)
-  {
-  }
   two_value_struct_abstract_objectt(const typet &type, bool top, bool bottom)
     : abstract_aggregate_baset(type, top, bottom)
   {
diff --git a/src/analyses/variable-sensitivity/two_value_union_abstract_object.h b/src/analyses/variable-sensitivity/two_value_union_abstract_object.h
@@ -24,12 +24,6 @@ class two_value_union_abstract_objectt : public abstract_aggregate_objectt<
     union_aggregate_typet>
     abstract_aggregate_baset;
 
-  /// \param type: the type the abstract_object is representing
-  explicit two_value_union_abstract_objectt(const typet &type)
-    : abstract_aggregate_baset(type)
-  {
-  }
-
   /// Start the abstract object at either top or bottom or neither
   /// Asserts if both top and bottom are true
   ///
diff --git a/src/analyses/variable-sensitivity/value_set_abstract_object.cpp b/src/analyses/variable-sensitivity/value_set_abstract_object.cpp
@@ -127,13 +127,6 @@ static abstract_object_sett widen_value_set(
   const constant_interval_exprt &lhs,
   const constant_interval_exprt &rhs);
 
-value_set_abstract_objectt::value_set_abstract_objectt(const typet &type)
-  : abstract_value_objectt(type)
-{
-  values.insert(std::make_shared<constant_abstract_valuet>(type));
-  verify();
-}
-
 value_set_abstract_objectt::value_set_abstract_objectt(
   const typet &type,
   bool top,
@@ -293,7 +286,8 @@ abstract_object_pointert value_set_abstract_objectt::resolve_values(
 void value_set_abstract_objectt::set_top_internal()
 {
   values.clear();
-  values.insert(std::make_shared<constant_abstract_valuet>(type()));
+  values.insert(
+    std::make_shared<constant_abstract_valuet>(type(), true, false));
 }
 
 void value_set_abstract_objectt::set_values(
diff --git a/src/analyses/variable-sensitivity/value_set_abstract_object.h b/src/analyses/variable-sensitivity/value_set_abstract_object.h
@@ -19,9 +19,6 @@ class value_set_abstract_objectt : public abstract_value_objectt,
                                    public value_set_tag
 {
 public:
-  /// \copydoc abstract_objectt::abstract_objectt(const typet&)
-  explicit value_set_abstract_objectt(const typet &type);
-
   /// \copydoc abstract_objectt::abstract_objectt(const typet &, bool, bool)
   value_set_abstract_objectt(const typet &type, bool top, bool bottom);
 
diff --git a/src/analyses/variable-sensitivity/value_set_pointer_abstract_object.cpp b/src/analyses/variable-sensitivity/value_set_pointer_abstract_object.cpp
@@ -29,13 +29,6 @@ unwrap_and_extract_values(const abstract_object_sett &values);
 static abstract_object_pointert
 maybe_extract_single_value(const abstract_object_pointert &maybe_singleton);
 
-value_set_pointer_abstract_objectt::value_set_pointer_abstract_objectt(
-  const typet &type)
-  : abstract_pointer_objectt(type)
-{
-  values.insert(std::make_shared<constant_pointer_abstract_objectt>(type));
-}
-
 value_set_pointer_abstract_objectt::value_set_pointer_abstract_objectt(
   const typet &new_type,
   bool top,
diff --git a/src/analyses/variable-sensitivity/value_set_pointer_abstract_object.h b/src/analyses/variable-sensitivity/value_set_pointer_abstract_object.h
@@ -19,9 +19,6 @@ class value_set_pointer_abstract_objectt : public abstract_pointer_objectt,
                                            public value_set_tag
 {
 public:
-  /// \copydoc abstract_objectt::abstract_objectt(const typet&)
-  explicit value_set_pointer_abstract_objectt(const typet &type);
-
   value_set_pointer_abstract_objectt(
     const typet &new_type,
     bool top,
diff --git a/src/analyses/variable-sensitivity/variable_sensitivity_object_factory.cpp b/src/analyses/variable-sensitivity/variable_sensitivity_object_factory.cpp
@@ -29,7 +29,7 @@ abstract_object_pointert
 create_context_abstract_object(const abstract_object_pointert &abstract_object)
 {
   return abstract_object_pointert(
-    new context_classt{abstract_object, abstract_object->type()});
+    new context_classt{abstract_object, abstract_object->type(), true, false});
 }
 
 template <class abstract_object_classt>
diff --git a/src/analyses/variable-sensitivity/write_location_context.h b/src/analyses/variable-sensitivity/write_location_context.h
@@ -34,13 +34,6 @@
 class write_location_contextt : public context_abstract_objectt
 {
 public:
-  explicit write_location_contextt(
-    const abstract_object_pointert child,
-    const typet &type)
-    : context_abstract_objectt(child, type)
-  {
-  }
-
   write_location_contextt(
     const abstract_object_pointert child,
     const typet &type,
diff --git a/unit/analyses/variable-sensitivity/variable_sensitivity_test_helpers.cpp b/unit/analyses/variable-sensitivity/variable_sensitivity_test_helpers.cpp

Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,6 @@ class abstract_aggregate_objectt : public abstract_objectt,`
`30`	`30`	`public abstract_aggregate_tag`
`31`	`31`	`{`
`32`	`32`	`public:`
`33`		`- explicit abstract_aggregate_objectt(const typet &type)`
`34`		`- : abstract_objectt(type)`
`35`		`- {`
`36`		`- PRECONDITION(type.id() == aggregate_traitst::TYPE_ID());`
`37`		`- }`
`38`		`-`
`39`	`33`	`abstract_aggregate_objectt(const typet &type, bool tp, bool bttm)`
`40`	`34`	`: abstract_objectt(type, tp, bttm)`
`41`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,6 @@`
`16`	`16`
`17`	`17`	`#include "abstract_object.h"`
`18`	`18`
`19`		`-abstract_objectt::abstract_objectt(const typet &type)`
`20`		`- : t(type), bottom(false), top(true)`
`21`		`-{`
`22`		`-}`
`23`		`-`
`24`	`19`	`abstract_objectt::abstract_objectt(const typet &type, bool top, bool bottom)`
`25`	`20`	`: t(type), bottom(bottom), top(top)`
`26`	`21`	`{`
`@@ -35,15 +30,6 @@ abstract_objectt::abstract_objectt(`
`35`	`30`	`{`
`36`	`31`	`}`
`37`	`32`
`38`		`-abstract_objectt::abstract_objectt(`
`39`		`- const typet &type,`
`40`		`- const exprt &expr,`
`41`		`- const abstract_environmentt &environment,`
`42`		`- const namespacet &ns)`
`43`		`- : t(type), bottom(false), top(true)`
`44`		`-{`
`45`		`-}`
`46`		`-`
`47`	`33`	`const typet &abstract_objectt::type() const`
`48`	`34`	`{`
`49`	`35`	`return t;`
Original file line number	Diff line number	Diff line change
`@@ -240,10 +240,6 @@ class abstract_value_objectt : public abstract_objectt,`
`240`	`240`	`public abstract_value_tag`
`241`	`241`	`{`
`242`	`242`	`public:`
`243`		`- explicit abstract_value_objectt(const typet &type) : abstract_objectt(type)`
`244`		`- {`
`245`		`- }`
`246`		`-`
`247`	`243`	`abstract_value_objectt(const typet &type, bool tp, bool bttm)`
`248`	`244`	`: abstract_objectt(type, tp, bttm)`
`249`	`245`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,6 @@ make_constant_index_range(const exprt &val)`
`37`	`37`	`return util_make_unique<constant_index_ranget>(val);`
`38`	`38`	`}`
`39`	`39`
`40`		`-constant_abstract_valuet::constant_abstract_valuet(const typet &t)`
`41`		`- : abstract_value_objectt(t), value()`
`42`		`-{`
`43`		`-}`
`44`		`-`
`45`	`40`	`constant_abstract_valuet::constant_abstract_valuet(const exprt &e)`
`46`	`41`	`: abstract_value_objectt(e.type(), false, false), value(e)`
`47`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`class constant_abstract_valuet : public abstract_value_objectt`
`20`	`20`	`{`
`21`	`21`	`public:`
`22`		`- explicit constant_abstract_valuet(const typet &t);`
`23`	`22`	`explicit constant_abstract_valuet(const exprt &t);`
`24`	`23`	`constant_abstract_valuet(const typet &t, bool tp, bool bttm);`
`25`	`24`	`constant_abstract_valuet(`