[Dive] Fix return expression dependency values

src/plugins/dive/build.ml

@@ -398,9 +398,9 @@ let build_node_deps context node =
 
   and build_return_deps callstack stmt args kf =
     match Kernel_function.find_return kf with
-    | {skind = Return (Some {enode = Lval lval_res},_)} ->
+    | {skind = Return (Some {enode = Lval lval_res},_)} as return_stmt ->
       let callstack = Callstack.push (kf,stmt) callstack in
-      build_lval_deps callstack stmt Data lval_res
+      build_lval_deps callstack return_stmt Data lval_res
     | _ -> assert false (* Cil invariant *)
     | exception Kernel_function.No_Statement ->
       (* the function is only a prototype *)

src/plugins/dive/tests/dive/oracle/assigned_param.dot

 digraph G {
   cp0 [label=<w>, shape=box, ];
-  cp1 [label=<x>, shape=box, ];
+  cp1 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+       style="filled", ];
   cp3 [label=<z>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled", ];
   cp5 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",

src/plugins/dive/tests/dive/oracle/callstack_strategy.dot

@@ -8,10 +8,12 @@ digraph G {
        style="filled", ];
   cp7 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled", ];
-  cp9 [label=<z>, shape=box, ];
+  cp9 [label=<z>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+       style="filled", ];
   cp11 [label=<a>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
         style="filled", ];
-  cp13 [label=<z>, shape=box, ];
+  cp13 [label=<z>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+        style="filled", ];
   cp16 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
         style="filled", ];
   

src/plugins/dive/tests/dive/oracle/const.dot

 digraph G {
   cp0 [label=<res>, shape=box, ];
-  cp1 [label=<__retres>, shape=box, ];
+  cp1 [label=<__retres>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+       style="filled", ];
   cp3 [label=<c>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled", ];
   cp5 [label=<w>, shape=box, fillcolor="#FFBBBB", color="#FF0000",

src/plugins/dive/tests/dive/oracle/per_callstack.dot

@@ -6,9 +6,12 @@ digraph G {
        style="filled", ];
   cp5 [label=<z>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled", ];
-  cp7 [label=<y>, shape=box, ];
-  cp9 [label=<y>, shape=box, ];
-  cp11 [label=<y>, shape=box, ];
+  cp7 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+       style="filled", ];
+  cp9 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+       style="filled", ];
+  cp11 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+        style="filled", ];
   cp13 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
         style="filled", ];
   cp15 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",

src/plugins/dive/tests/dive/oracle/pointed_param.dot

@@ -2,9 +2,12 @@ digraph G {
   cp0 [label=<y>, shape=box, ];
   cp1 [label=<tmp>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled", ];
-  cp3 [label=<tmp>, shape=box, ];
-  cp5 [label=<tmp>, shape=box, ];
-  cp7 [label=<__retres>, shape=box, ];
+  cp3 [label=<tmp>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+       style="filled", ];
+  cp5 [label=<tmp>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+       style="filled", ];
+  cp7 [label=<__retres>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+       style="filled", ];
   cp9 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
        style="filled,dotted", ];