From: weiyu <weiyuluo1232@gmail.com>
Date: Mon, 8 Jul 2019 23:45:24 +0000 (-0700)
Subject: merge and resolve conflict
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=54210d33af73ae7c74f2d416ab0e7bd472379e12;p=c11tester.git

merge and resolve conflict
---

54210d33af73ae7c74f2d416ab0e7bd472379e12
diff --cc classlist.h
index 67f6f8b7,e6a5e4ec..3aca3e11
--- a/classlist.h
+++ b/classlist.h
@@@ -22,5 -17,6 +20,7 @@@ class FuncInst
  struct model_snapshot_members;
  struct bug_message;
  typedef SnapList<ModelAction *> action_list_t;
 +typedef SnapList<uint32_t> func_id_list_t;
+ 
+ extern volatile int forklock;
  #endif
diff --cc execution.cc
index 17767419,c9fb39f1..c5c40a91
--- a/execution.cc
+++ b/execution.cc
@@@ -63,12 -61,9 +62,11 @@@ ModelExecution::ModelExecution(ModelChe
  	mutex_map(),
  	thrd_last_action(1),
  	thrd_last_fence_release(),
- 	node_stack(node_stack),
  	priv(new struct model_snapshot_members ()),
 -			 mo_graph(new CycleGraph()),
 -	fuzzer(new Fuzzer())
 +	mo_graph(new CycleGraph()),
 +	fuzzer(new Fuzzer()),
 +	thrd_func_list(),
 +	thrd_func_inst_lists()
  {
  	/* Initialize a model-checker thread, for special ModelActions */
  	model_thread = new Thread(get_next_id());