Replace owning raw pointers with unique_ptr

Author: reuk

src/analyses/ai.h

@@ -9,6 +9,8 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_ANALYSES_AI_H
 #define CPROVER_ANALYSES_AI_H
 
+#include "util/make_unique.h"
+
 #include <map>
 #include <iosfwd>
 #include <sstream>
@@ -327,7 +329,7 @@ class ai_baset
     const namespacet &ns)=0;
   virtual statet &get_state(locationt l)=0;
   virtual const statet &find_state(locationt l) const=0;
-  virtual statet* make_temporary_state(const statet &s)=0;
+  virtual std::unique_ptr<statet> make_temporary_state(const statet &s)=0;
 };
 
 // domainT is expected to be derived from ai_domain_baseT
@@ -393,9 +395,9 @@ class ait:public ai_baset
       static_cast<const domainT &>(src), from, to);
   }
 
-  statet *make_temporary_state(const statet &s) override
+  std::unique_ptr<statet> make_temporary_state(const statet &s) override
   {
-    return new domainT(static_cast<const domainT &>(s));
+    return util_make_unique<domainT>(static_cast<const domainT &>(s));
   }
 
   void fixedpoint(

src/analyses/goto_rw.cpp

@@ -8,6 +8,8 @@ Date: April 2010
 
 \*******************************************************************/
 
+#include "util/make_unique.h"
+
 #include <limits>
 #include <algorithm>
 
@@ -85,12 +87,12 @@ rw_range_sett::~rw_range_sett()
   for(rw_range_sett::objectst::iterator it=r_range_set.begin();
       it!=r_range_set.end();
       ++it)
-    delete it->second;
+    it->second=nullptr;
 
   for(rw_range_sett::objectst::iterator it=w_range_set.begin();
       it!=w_range_set.end();
       ++it)
-    delete it->second;
+    it->second=nullptr;
 }
 
 /*******************************************************************\
@@ -652,14 +654,15 @@ void rw_range_sett::add(
   const range_spect &range_start,
   const range_spect &range_end)
 {
-  objectst::iterator entry=(mode==LHS_W ? w_range_set : r_range_set).
-    insert(
-      std::pair<const irep_idt&, range_domain_baset*>(identifier, 0)).first;
+  objectst::iterator entry=
+    (mode==LHS_W ? w_range_set : r_range_set).insert(
+      std::pair<const irep_idt&, std::unique_ptr<range_domain_baset>>(
+        identifier, nullptr)).first;
 
-  if(entry->second==0)
-    entry->second=new range_domaint();
+  if(entry->second==nullptr)
+    entry->second=util_make_unique<range_domaint>();
 
-  static_cast<range_domaint*>(entry->second)->push_back(
+  static_cast<range_domaint&>(*entry->second).push_back(
     std::make_pair(range_start, range_end));
 }
 
@@ -936,16 +939,16 @@ void rw_guarded_range_set_value_sett::add(
   const range_spect &range_start,
   const range_spect &range_end)
 {
-  objectst::iterator entry=(mode==LHS_W ? w_range_set : r_range_set).
-    insert(
-      std::pair<const irep_idt&, range_domain_baset*>(identifier, 0)).first;
+  objectst::iterator entry=
+    (mode==LHS_W ? w_range_set : r_range_set).insert(
+      std::pair<const irep_idt&, std::unique_ptr<range_domain_baset>>(
+        identifier, nullptr)).first;
 
-  if(entry->second==0)
-    entry->second=new guarded_range_domaint();
+  if(entry->second==nullptr)
+    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())));
+  static_cast<guarded_range_domaint&>(*entry->second).insert(
+    std::make_pair(range_start, std::make_pair(range_end, guard.as_expr())));
 }
 
 /*******************************************************************\

src/analyses/goto_rw.h

@@ -19,6 +19,8 @@ Date: April 2010
 
 #include <goto-programs/goto_program.h>
 
+#include <memory> // unique_ptr
+
 #define forall_rw_range_set_r_objects(it, rw_set) \
   for(rw_range_sett::objectst::const_iterator it=(rw_set).get_r_set().begin(); \
       it!=(rw_set).get_r_set().end(); ++it)
@@ -82,10 +84,10 @@ class rw_range_sett
 {
 public:
   #ifdef USE_DSTRING
-  typedef std::map<irep_idt, range_domain_baset*> objectst;
+  typedef std::map<irep_idt, std::unique_ptr<range_domain_baset>> objectst;
   #else
-  typedef std::unordered_map<irep_idt, range_domain_baset*, string_hash>
-    objectst;
+  typedef std::unordered_map<
+    irep_idt, std::unique_ptr<range_domain_baset>, string_hash> objectst;
   #endif
 
   virtual ~rw_range_sett();
@@ -107,8 +109,8 @@ class rw_range_sett
 
   const range_domaint &get_ranges(objectst::const_iterator it) const
   {
-    assert(dynamic_cast<range_domaint*>(it->second)!=0);
-    return *static_cast<range_domaint*>(it->second);
+    assert(dynamic_cast<range_domaint*>(it->second.get())!=nullptr);
+    return static_cast<const range_domaint &>(*it->second);
   }
 
   typedef enum { LHS_W, READ } get_modet;
@@ -276,8 +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)!=0);
-    return *static_cast<guarded_range_domaint*>(it->second);
+    assert(dynamic_cast<guarded_range_domaint*>(it->second.get())!=nullptr);
+    return static_cast<const guarded_range_domaint &>(*it->second);
   }
 
   virtual void get_objects_rec(

src/analyses/local_may_alias.h

@@ -9,6 +9,7 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_ANALYSES_LOCAL_MAY_ALIAS_H
 #define CPROVER_ANALYSES_LOCAL_MAY_ALIAS_H
 
+#include "util/make_unique.h"
 #include <stack>
 #include <memory>
 
@@ -122,8 +123,7 @@ class local_may_alias_factoryt
     goto_functionst::function_mapt::const_iterator f_it2=
       goto_functions->function_map.find(fkt);
     assert(f_it2!=goto_functions->function_map.end());
-    return *(fkt_map[fkt]=std::unique_ptr<local_may_aliast>(
-              new local_may_aliast(f_it2->second)));
+    return *(fkt_map[fkt]=util_make_unique<local_may_aliast>(f_it2->second));
   }
 
   local_may_aliast &operator()(goto_programt::const_targett t)

src/analyses/reaching_definitions.cpp

@@ -11,6 +11,7 @@ Date: February 2013
 
 #include <util/pointer_offset_size.h>
 #include <util/prefix.h>
+#include "util/make_unique.h"
 
 #include <pointer-analysis/value_set_analysis_fi.h>
 
@@ -19,6 +20,16 @@ Date: February 2013
 
 #include "reaching_definitions.h"
 
+reaching_definitions_analysist::reaching_definitions_analysist(
+  const namespacet &_ns):
+    concurrency_aware_ait<rd_range_domaint>(),
+    ns(_ns)
+{
+}
+
+
+reaching_definitions_analysist::~reaching_definitions_analysist()=default;
+
 /*******************************************************************\
 
 Function: rd_range_domaint::populate_cache
@@ -886,28 +897,6 @@ const rd_range_domaint::ranges_at_loct &rd_range_domaint::get(
 
 /*******************************************************************\
 
-Function: reaching_definitions_analysist::~reaching_definitions_analysist
-
-  Inputs:
-
- Outputs:
-
- Purpose:
-
-\*******************************************************************/
-
-reaching_definitions_analysist::~reaching_definitions_analysist()
-{
-  if(is_dirty)
-    delete is_dirty;
-  if(is_threaded)
-    delete is_threaded;
-  if(value_sets)
-    delete value_sets;
-}
-
-/*******************************************************************\
-
 Function: reaching_definitions_analysist::initialize
 
   Inputs:
@@ -921,13 +910,13 @@ Function: reaching_definitions_analysist::initialize
 void reaching_definitions_analysist::initialize(
   const goto_functionst &goto_functions)
 {
-  value_set_analysis_fit *value_sets_=new value_set_analysis_fit(ns);
+  auto value_sets_=util_make_unique<value_set_analysis_fit>(ns);
   (*value_sets_)(goto_functions);
-  value_sets=value_sets_;
+  value_sets=std::move(value_sets_);
 
-  is_threaded=new is_threadedt(goto_functions);
+  is_threaded=util_make_unique<is_threadedt>(goto_functions);
 
-  is_dirty=new dirtyt(goto_functions);
+  is_dirty=util_make_unique<dirtyt>(goto_functions);
 
   concurrency_aware_ait<rd_range_domaint>::initialize(goto_functions);
 }

src/analyses/reaching_definitions.h

@@ -236,16 +236,9 @@ class reaching_definitions_analysist:
 {
 public:
   // constructor
-  explicit reaching_definitions_analysist(const namespacet &_ns):
-    concurrency_aware_ait<rd_range_domaint>(),
-    ns(_ns),
-    value_sets(0),
-    is_threaded(0),
-    is_dirty(0)
-  {
-  }
+  explicit reaching_definitions_analysist(const namespacet &_ns);
 
-  virtual ~reaching_definitions_analysist();
+  ~reaching_definitions_analysist();
 
   virtual void initialize(
     const goto_functionst &goto_functions);
@@ -282,9 +275,9 @@ class reaching_definitions_analysist:
 
 protected:
   const namespacet &ns;
-  value_setst * value_sets;
-  is_threadedt * is_threaded;
-  dirtyt * is_dirty;
+  std::unique_ptr<value_setst> value_sets;
+  std::unique_ptr<is_threadedt> is_threaded;
+  std::unique_ptr<dirtyt> is_dirty;
 };
 
 #endif // CPROVER_ANALYSES_REACHING_DEFINITIONS_H

src/analyses/static_analysis.h

@@ -13,6 +13,8 @@ Author: Daniel Kroening, [email protected]
 #error Deprecated, use ai.h instead
 #endif
 
+#include "util/make_unique.h"
+
 #include <map>
 #include <iosfwd>
 #include <unordered_set>
@@ -249,7 +251,7 @@ class static_analysis_baset
   virtual void generate_state(locationt l)=0;
   virtual statet &get_state(locationt l)=0;
   virtual const statet &get_state(locationt l) const=0;
-  virtual statet* make_temporary_state(statet &s)=0;
+  virtual std::unique_ptr<statet> make_temporary_state(statet &s)=0;
 
   typedef domain_baset::expr_sett expr_sett;
 
@@ -328,9 +330,9 @@ class static_analysist:public static_analysis_baset
     return static_cast<T &>(a).merge(static_cast<const T &>(b), to);
   }
 
-  virtual statet *make_temporary_state(statet &s)
+  virtual std::unique_ptr<statet> make_temporary_state(statet &s)
   {
-    return new T(static_cast<T &>(s));
+    return util_make_unique<T>(static_cast<T &>(s));
   }
 
   virtual void generate_state(locationt l)

src/ansi-c/ansi_c_language.cpp

@@ -231,9 +231,9 @@ Function: new_ansi_c_language
 
 \*******************************************************************/
 
-languaget *new_ansi_c_language()
+std::unique_ptr<languaget> new_ansi_c_language()
 {
-  return new ansi_c_languaget;
+  return util_make_unique<ansi_c_languaget>();
 }
 
 /*******************************************************************\

src/ansi-c/ansi_c_language.h

@@ -12,6 +12,7 @@ Author: Daniel Kroening, [email protected]
 /*! \defgroup gr_ansi_c ANSI-C front-end */
 
 #include <util/language.h>
+#include "util/make_unique.h"
 
 #include "ansi_c_parse_tree.h"
 
@@ -63,8 +64,8 @@ class ansi_c_languaget:public languaget
     exprt &expr,
     const namespacet &ns) override;
 
-  languaget *new_language() override
-  { return new ansi_c_languaget; }
+  std::unique_ptr<languaget> new_language() override
+  { return util_make_unique<ansi_c_languaget>(); }
 
   std::string id() const override { return "C"; }
   std::string description() const override { return "ANSI-C 99"; }
@@ -77,6 +78,6 @@ class ansi_c_languaget:public languaget
   std::string parse_path;
 };
 
-languaget *new_ansi_c_language();
+std::unique_ptr<languaget> new_ansi_c_language();
 
 #endif // CPROVER_ANSI_C_ANSI_C_LANGUAGE_H

src/cbmc/bmc.cpp

@@ -417,11 +417,11 @@ safety_checkert::resultt bmct::run(
   std::unique_ptr<memory_model_baset> memory_model;
 
   if(mm.empty() || mm=="sc")
-    memory_model=std::unique_ptr<memory_model_baset>(new memory_model_sct(ns));
+    memory_model=util_make_unique<memory_model_sct>(ns);
   else if(mm=="tso")
-    memory_model=std::unique_ptr<memory_model_baset>(new memory_model_tsot(ns));
+    memory_model=util_make_unique<memory_model_tsot>(ns);
   else if(mm=="pso")
-    memory_model=std::unique_ptr<memory_model_baset>(new memory_model_psot(ns));
+    memory_model=util_make_unique<memory_model_psot>(ns);
   else
   {
     error() << "Invalid memory model " << mm

src/cbmc/cbmc_main.cpp

@@ -43,7 +43,8 @@ extern unsigned long long irep_cmp_ne_cnt;
 #ifdef _MSC_VER
 int wmain(int argc, const wchar_t **argv_wide)
 {
-  const char **argv=narrow_argv(argc, argv_wide);
+  auto vec=narrow_argv(argc, argv_wide);
+  auto argv=vec.data();
 #else
 int main(int argc, const char **argv)
 {

src/cbmc/cbmc_parse_options.cpp

@@ -650,9 +650,9 @@ int cbmc_parse_optionst::get_goto_program(
         return 6;
       }
 
-      languaget *language=get_language_from_filename(filename);
+      auto language=get_language_from_filename(filename);
 
-      if(language==NULL)
+      if(!language)
       {
         error() << "failed to figure out type of file `"
                 <<  filename << "'" << eom;
@@ -811,19 +811,17 @@ void cbmc_parse_optionst::preprocessing()
       return;
     }
 
-    languaget *ptr=get_language_from_filename(filename);
+    auto ptr=get_language_from_filename(filename);
 
-    if(ptr==NULL)
+    if(!ptr)
     {
       error() << "failed to figure out type of file" << eom;
       return;
     }
 
     ptr->set_message_handler(get_message_handler());
 
-    std::unique_ptr<languaget> language(ptr);
-
-    if(language->preprocess(infile, filename, std::cout))
+    if(ptr->preprocess(infile, filename, std::cout))
       error() << "PREPROCESSING ERROR" << eom;
   }