analyzer: use std::unique_ptr for known functions

gcc/analyzer/ChangeLog:
	* analyzer.h: Use std::unique_ptr for known functions.
	* engine.cc: Likewise.
	* known-function-manager.cc: Likewise.
	* known-function-manager.h: Likewise.

gcc/testsuite/ChangeLog:
	* gcc.dg/plugin/analyzer_kernel_plugin.c: Use std::unique_ptr for
	known functions.
	* gcc.dg/plugin/analyzer_known_fns_plugin.c: Likewise.

Signed-off-by: David Malcolm <dmalcolm@redhat.com>

diff --git a/gcc/analyzer/analyzer.h b/gcc/analyzer/analyzer.h
index d8d3e78b20a3f908e2cc7f3aebede94822014646..88fdc1d04f0162d1650770e815975fa5d6f6370f 100644 (file)
--- a/gcc/analyzer/analyzer.h
+++ b/gcc/analyzer/analyzer.h
@@ -244,7 +244,7 @@ class plugin_analyzer_init_iface
 public:
   virtual void register_state_machine (state_machine *) = 0;
   virtual void register_known_function (const char *name,
-                                       known_function *) = 0;
+                                       std::unique_ptr<known_function>) = 0;
   virtual logger *get_logger () const = 0;
 };
 

diff --git a/gcc/analyzer/engine.cc b/gcc/analyzer/engine.cc
index d770c6fc29cedceccbd7a47307cf9c4753bc7d71..fe17f8f76ce2d4fef8d7e52387d7046bdf6544d2 100644 (file)
--- a/gcc/analyzer/engine.cc
+++ b/gcc/analyzer/engine.cc
@@ -5960,10 +5960,10 @@ public:
   }
 
   void register_known_function (const char *name,
-                               known_function *kf) final override
+                               std::unique_ptr<known_function> kf) final override
   {
     LOG_SCOPE (m_logger);
-    m_known_fn_mgr->add (name, kf);
+    m_known_fn_mgr->add (name, std::move (kf));
   }
 
   logger *get_logger () const final override

diff --git a/gcc/analyzer/known-function-manager.cc b/gcc/analyzer/known-function-manager.cc
index 42dfe3af583deda5296e22d9b3976104d660dfcf..7341b06848083fa7d56b1a088e39db0f921b68f2 100644 (file)
--- a/gcc/analyzer/known-function-manager.cc
+++ b/gcc/analyzer/known-function-manager.cc
@@ -48,11 +48,12 @@ known_function_manager::~known_function_manager ()
 }
 
 void
-known_function_manager::add (const char *name, known_function *kf)
+known_function_manager::add (const char *name,
+                            std::unique_ptr<known_function> kf)
 {
   LOG_FUNC_1 (get_logger (), "registering %s", name);
   tree id = get_identifier (name);
-  m_map_id_to_kf.put (id, kf);
+  m_map_id_to_kf.put (id, kf.release ());
 }
 
 const known_function *

diff --git a/gcc/analyzer/known-function-manager.h b/gcc/analyzer/known-function-manager.h
index 2b95b7e2589843c6b3b74b2d0303add7416b1a68..daf1bc57855d7e6911aa62c082c22129f4a2e4d0 100644 (file)
--- a/gcc/analyzer/known-function-manager.h
+++ b/gcc/analyzer/known-function-manager.h
@@ -30,7 +30,7 @@ class known_function_manager : public log_user
 public:
   known_function_manager (logger *logger);
   ~known_function_manager ();
-  void add (const char *name, known_function *kf);
+  void add (const char *name, std::unique_ptr<known_function> kf);
   const known_function *get_by_identifier (tree identifier);
   const known_function *get_by_fndecl (tree fndecl);
 

diff --git a/gcc/testsuite/gcc.dg/plugin/analyzer_kernel_plugin.c b/gcc/testsuite/gcc.dg/plugin/analyzer_kernel_plugin.c
index dfa30c8d61b40ffbffe75173dd36f7aa2dace747..92b4dfbd4d0237d6b764ee4b447495d5235145ce 100644 (file)
--- a/gcc/testsuite/gcc.dg/plugin/analyzer_kernel_plugin.c
+++ b/gcc/testsuite/gcc.dg/plugin/analyzer_kernel_plugin.c
@@ -210,10 +210,11 @@ kernel_analyzer_init_cb (void *gcc_data, void */*user_data*/)
   LOG_SCOPE (iface->get_logger ());
   if (0)
     inform (input_location, "got here: kernel_analyzer_init_cb");
-  iface->register_known_function ("copy_from_user",
-                                 new known_function_copy_from_user ());
+  iface->register_known_function
+    ("copy_from_user",
+     make_unique<known_function_copy_from_user> ());
   iface->register_known_function ("copy_to_user",
-                                 new known_function_copy_to_user ());
+                                 make_unique<known_function_copy_to_user> ());
 }
 
 } // namespace ana

diff --git a/gcc/testsuite/gcc.dg/plugin/analyzer_known_fns_plugin.c b/gcc/testsuite/gcc.dg/plugin/analyzer_known_fns_plugin.c
index 5c1f3986aa77b09fd0ede29300ccd61f6d990f04..e9f607f58fe5f31bfe447c375c959765576d0015 100644 (file)
--- a/gcc/testsuite/gcc.dg/plugin/analyzer_known_fns_plugin.c
+++ b/gcc/testsuite/gcc.dg/plugin/analyzer_known_fns_plugin.c
@@ -175,9 +175,10 @@ known_fn_analyzer_init_cb (void *gcc_data, void */*user_data*/)
   if (0)
     inform (input_location, "got here: known_fn_analyzer_init_cb");
   iface->register_known_function ("returns_42",
-                                 new known_function_returns_42 ());
-  iface->register_known_function ("attempt_to_copy",
-                                 new known_function_attempt_to_copy ());
+                                 make_unique<known_function_returns_42> ());
+  iface->register_known_function
+    ("attempt_to_copy",
+     make_unique<known_function_attempt_to_copy> ());
 }
 
 } // namespace ana