sc_process: only delete processes within kernel context

accellera-official · May 22, 2018 · f567c9c · f567c9c
1 parent c81e0d9
commit f567c9c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/sysc/kernel/sc_process.cpp b/src/sysc/kernel/sc_process.cpp
@@ -172,7 +172,7 @@ void sc_process_b::delete_process()
 
     // Immediate deletion:
 
-    if ( this != sc_get_current_process_b() )
+    if ( NULL == sc_get_current_process_b() )
     {
         delete this;
     }
@@ -182,7 +182,7 @@ void sc_process_b::delete_process()
 
     else
     {
-	m_references_n = 1;
+        m_references_n = 1;
         detach();
         simcontext()->mark_to_collect_process( this );
     }

diff --git a/src/sysc/kernel/sc_simcontext.cpp b/src/sysc/kernel/sc_simcontext.cpp
@@ -600,6 +600,7 @@ sc_simcontext::crunch( bool once )
     // by '*m_error'.
 out:
     this->reset_curr_proc();
+    do_collect_processes();
     if( m_error ) throw *m_error; // re-throw propagated error
 }