Merge pull request #1511 from tautschnig/fix-graphml

Fix graphml output of concurrency witnesses

Author: kroening

regression/cbmc-concurrency/graphml_witness1/main.c

@@ -0,0 +1,8 @@
+int global;
+
+int main()
+{
+  __CPROVER_ASYNC_1: global=1;
+  global=2;
+  assert(global==2); // to fail
+}

regression/cbmc-concurrency/graphml_witness1/test.desc

@@ -0,0 +1,10 @@
+CORE
+main.c
+--graphml-witness -
+^EXIT=10$
+^SIGNAL=0$
+^VERIFICATION FAILED$
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+</graphml>
+--
+^warning: ignoring

src/goto-programs/graphml_witness.cpp

@@ -141,7 +141,7 @@ static bool filter_out(
   goto_tracet::stepst::const_iterator &it)
 {
   if(it->hidden &&
-     (!it->is_assignment() ||
+     (!it->pc->is_assign() ||
       to_code_assign(it->pc->code).rhs().id()!=ID_side_effect ||
       to_code_assign(it->pc->code).rhs().get(ID_statement)!=ID_nondet))
     return true;