Fix asan issues related to solver and symbol manager (#5457)

Should fix the nightlies.

diff --git a/src/main/command_executor.cpp b/src/main/command_executor.cpp
index be90be3f0fe2780fd51e86885a397af382e200c6..b1a7c70b514f3b6ca5cf4c9cefdc327be46104e3 100644 (file)
--- a/src/main/command_executor.cpp
+++ b/src/main/command_executor.cpp
@@ -57,6 +57,12 @@ CommandExecutor::CommandExecutor(Options& options)
       d_result()
 {
 }
+CommandExecutor::~CommandExecutor()
+{
+  // ensure that symbol manager is destroyed before solver
+  d_symman.reset(nullptr);
+  d_solver.reset(nullptr);
+}
 
 void CommandExecutor::flushStatistics(std::ostream& out) const
 {

diff --git a/src/main/command_executor.h b/src/main/command_executor.h
index acf9e45bb47e6edc381fcdbbb5ec79a098684da3..4023b86debe201f9b5627955238347a8401cde39 100644 (file)
--- a/src/main/command_executor.h
+++ b/src/main/command_executor.h
@@ -61,9 +61,7 @@ class CommandExecutor
  public:
   CommandExecutor(Options& options);
 
-  virtual ~CommandExecutor()
-  {
-  }
+  virtual ~CommandExecutor();
 
   /**
    * Executes a command. Recursively handles if cmd is a command

diff --git a/test/unit/main/interactive_shell_black.h b/test/unit/main/interactive_shell_black.h
index 993f246901aa5e46c54520bb0adc671d5cbbb6f4..df6a79bd889a1a060ff5ea6b2aca2a5e6b649317 100644 (file)
--- a/test/unit/main/interactive_shell_black.h
+++ b/test/unit/main/interactive_shell_black.h
@@ -52,6 +52,9 @@ class InteractiveShellBlack : public CxxTest::TestSuite
   {
     delete d_sin;
     delete d_sout;
+    // ensure that symbol manager is destroyed before solver
+    d_symman.reset(nullptr);
+    d_solver.reset(nullptr);
   }
 
   void testAssertTrue() {