move the 'link_insts' method to FuncNode class

[c11tester.git] / cmodelint.cc

diff --git a/cmodelint.cc b/cmodelint.cc
index 734a95428097b6b78773d60f3d462a42ef62db5d..82bf974f03b99b7aaae1ecd7b4fd440ed05f104f 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -395,5 +395,12 @@ void cds_func_exit(const char * funcName) {
        ModelHistory *history = model->get_history();
        func_id = history->getFuncMap()->get(funcName);
 
+       /* func_id not found; this could happen in the case where a function calls cds_func_entry
+       * when the model has been defined yet, but then an atomic inside the function initializes 
+       * the model. And then cds_func_exit is called upon the function exiting. 
+       */
+       if (func_id == 0)
+               return;
+
        history->exit_function(func_id, th->get_id());
 }