Merge pull request diffblue#262 from diffblue/issue259

Include GOTO guard expressions in variable sensitivity data dependencies

Author: chrisr-diffblue

regression/goto-analyzer/variable-sensitivity-dependence-graph/main.c

@@ -28,7 +28,7 @@ void main(void)
   if (in == 1)
     ar[0]++;
 
-  if (in == 2)
+  if (out1 == 2)
     ar[1]++;
 
   out1 = ar[0];

regression/goto-analyzer/variable-sensitivity-dependence-graph/test.desc

@@ -1,4 +1,4 @@
-FUTURE
+CORE
 main.c
 file1.c file2.c --dependence-graph-vs --structs --arrays --show
 EXIT=0
@@ -9,6 +9,7 @@ SIGNAL=0
 ^Data dependencies: 4 \[st.b\], 53 \[st.b\]$
 ^Data dependencies: 1 \[st.a\], 4 \[st.b\], 53 \[st.a, st.b\]$
 ^Data dependencies: 48 \[ar\[\(signed long int\)0\]\]$
+^Data dependencies: 1 \[out1\], 6 \[out1\], 53 \[out1\]$
 ^Data dependencies: 48 \[ar\[\(signed long int\)1\]\]$
 ^Data dependencies: 10 \[ar\[\(signed long int\)0\]\], 48 \[ar\[\(signed long int\)0\]\]$
 ^Data dependencies: 13 \[ar\[\(signed long int\)1\]\], 48 \[ar\[\(signed long int\)1\]\]$

src/analyses/variable-sensitivity/variable_sensitivity_dependence_graph.cpp

@@ -137,6 +137,10 @@ void variable_sensitivity_dependence_domaint::data_dependencies(
       eval_data_deps(arg, ns, domain_data_deps);
     }
   }
+  else if (to->is_goto())
+  {
+    eval_data_deps(to->guard, ns, domain_data_deps);
+  }
 }
 
 void variable_sensitivity_dependence_domaint::control_dependencies(