Merge branch 'mppa-work' into mppa-branch-info

Conflicts:
	backend/Duplicateaux.ml

1 files changed, 11 insertions, 8 deletions

diff --git a/backend/Duplicateaux.ml b/backend/Duplicateaux.ml
index c2839bc3..1548765e 100644
--- a/backend/Duplicateaux.ml
+++ b/backend/Duplicateaux.ml
@@ -508,12 +508,15 @@ let rec invert_iconds code = function
 
 let duplicate_aux f =
   let entrypoint = f.fn_entrypoint in
-  let code = update_directions (f.fn_code) entrypoint in
-  let traces = select_traces code entrypoint in
-  let icond_code = invert_iconds code traces in
-  let preds = get_predecessors_rtl icond_code in
-  if !Clflags.option_fduplicate >= 1 then
-    let (new_code, pTreeId) = ((* print_traces traces; *) superblockify_traces icond_code preds traces) in
-    ((new_code, f.fn_entrypoint), pTreeId)
+  if !Clflags.option_fduplicate < 0 then
+    ((f.fn_code, entrypoint), make_identity_ptree f.fn_code)
   else
-    ((icond_code, entrypoint), make_identity_ptree code)
+    let code = update_directions (f.fn_code) entrypoint in
+    let traces = select_traces code entrypoint in
+    let icond_code = invert_iconds code traces in
+    let preds = get_predecessors_rtl icond_code in
+    if !Clflags.option_fduplicate >= 1 then
+      let (new_code, pTreeId) = ((* print_traces traces; *) superblockify_traces icond_code preds traces) in
+      ((new_code, f.fn_entrypoint), pTreeId)
+    else
+      ((icond_code, entrypoint), make_identity_ptree code)