Implement @tautschnig's fixes

Author: reuk

src/analyses/goto_rw.cpp

@@ -475,7 +475,7 @@ void rw_range_sett::add(
     entry->second=util_make_unique<range_domaint>();
 
   static_cast<range_domaint&>(*entry->second).push_back(
-    std::make_pair(range_start, range_end));
+    {range_start, range_end});
 }
 
 void rw_range_sett::get_objects_rec(
@@ -678,7 +678,7 @@ void rw_guarded_range_set_value_sett::add(
     entry->second=util_make_unique<guarded_range_domaint>();
 
   static_cast<guarded_range_domaint&>(*entry->second).insert(
-    std::make_pair(range_start, std::make_pair(range_end, guard.as_expr())));
+    {range_start, {range_end, guard.as_expr()}});
 }
 
 void goto_rw(goto_programt::const_targett target,

src/analyses/goto_rw.h

@@ -109,7 +109,7 @@ class rw_range_sett
 
   const range_domaint &get_ranges(objectst::const_iterator it) const
   {
-    assert(dynamic_cast<range_domaint*>(it->second.get()));
+    PRECONDITION(dynamic_cast<range_domaint*>(it->second.get())!=nullptr);
     return static_cast<const range_domaint &>(*it->second);
   }
 
@@ -278,7 +278,8 @@ class rw_guarded_range_set_value_sett:public rw_range_set_value_sett
 
   const guarded_range_domaint &get_ranges(objectst::const_iterator it) const
   {
-    assert(dynamic_cast<guarded_range_domaint*>(it->second.get())!=nullptr);
+    PRECONDITION(
+      dynamic_cast<guarded_range_domaint*>(it->second.get())!=nullptr);
     return static_cast<const guarded_range_domaint &>(*it->second);
   }
 

src/util/freer.h

@@ -12,6 +12,15 @@ Author: Reuben Thomas, [email protected]
 #include <cstdlib>
 #include <utility>
 
+/// A functor wrapping `std::free`. Can be used as the deleter of a unique_ptr
+/// to free memory originally allocated by `std::malloc`. This is primarily
+/// useful for interfacing with C APIs in a memory-safe way.
+/// Note that the approach of using an empty functor as a unique_ptr deleter
+/// does not impose any space overhead on the unique_ptr instance, whereas
+/// using a function-pointer as the deleter requires the unique_ptr to store
+/// this function pointer internally, effectively doubling the size of the
+/// object. Therefore, `std::unique_ptr<T, freert>` should be preferred to
+/// `std::unique_ptr<T, decltype(&std::free)>`.
 struct freert
 {
   template <typename T>