From a7098538edfda9fdbd95bc7c6ba6e380811230fa Mon Sep 17 00:00:00 2001
From: Cyril SIX <cyril.six@kalray.eu>
Date: Tue, 10 Mar 2020 15:41:05 +0100
Subject: Linearizeaux, forgot to visit the rest of the nodes in dfs_visit

---
 backend/Linearizeaux.ml | 48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

(limited to 'backend/Linearizeaux.ml')

diff --git a/backend/Linearizeaux.ml b/backend/Linearizeaux.ml
index 3602cb91..5bdeeb8f 100644
--- a/backend/Linearizeaux.ml
+++ b/backend/Linearizeaux.ml
@@ -350,6 +350,7 @@ let construct_depmap code entry fs =
       !index
     end
   in let check_and_update_depmap from target =
+    (* Printf.printf "From %d to %d\n" (P.to_int from) (P.to_int target); *)
     if not (ppmap_is_true (from, target) is_loop_edge) then
       let in_index_fs = find_index_of_node from in
       let out_index_fs = find_index_of_node target in
@@ -360,28 +361,31 @@ let construct_depmap code entry fs =
   in let rec dfs_visit code = function
   | [] -> ()
   | node :: ln ->
-      match (get_some @@ PTree.get node !visited) with
-      | true -> ()
-      | false -> begin
-          visited := PTree.set node true !visited;
-          let bb = get_some @@ PTree.get node code in
-          let next_visits =
-            match (last_element bb) with
-            | Ltailcall _ | Lreturn -> []
-            | Lbranch n -> (check_and_update_depmap node n; [n])
-            | Lcond (_, _, ifso, ifnot) -> begin
-                check_and_update_depmap node ifso;
-                check_and_update_depmap node ifnot;
-                [ifso; ifnot]
-              end
-            | Ljumptable(_, ln) -> begin
-                List.iter (fun n -> check_and_update_depmap node n) ln;
-                ln
-              end
-            (* end of bblocks should not be another value than one of the above *)
-            | _ -> failwith "last_element gave an invalid output"
-          in dfs_visit code next_visits
-        end
+      begin
+        match (get_some @@ PTree.get node !visited) with
+        | true -> ()
+        | false -> begin
+            visited := PTree.set node true !visited;
+            let bb = get_some @@ PTree.get node code in
+            let next_visits =
+              match (last_element bb) with
+              | Ltailcall _ | Lreturn -> []
+              | Lbranch n -> (check_and_update_depmap node n; [n])
+              | Lcond (_, _, ifso, ifnot) -> begin
+                  check_and_update_depmap node ifso;
+                  check_and_update_depmap node ifnot;
+                  [ifso; ifnot]
+                end
+              | Ljumptable(_, ln) -> begin
+                  List.iter (fun n -> check_and_update_depmap node n) ln;
+                  ln
+                end
+              (* end of bblocks should not be another value than one of the above *)
+              | _ -> failwith "last_element gave an invalid output"
+            in dfs_visit code next_visits
+          end;
+        dfs_visit code ln
+      end
   in begin
     dfs_visit code [entry];
     depmap
-- 
cgit