Initialize CIL after initializing CIL options

initCIL already depends on theMachine, but it overwrites it. Must use envMachine to select it based on exp.architecture beforehand.
goblint · Sep 24, 2024 · 84e738b · 84e738b
1 parent 917cf7e
commit 84e738b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/common/util/cilfacade.ml b/src/common/util/cilfacade.ml
@@ -50,12 +50,10 @@ let init_options () =
   Cabs2cil.addNestedScopeAttr := get_bool "cil.addNestedScopeAttr";
 
   if get_bool "ana.sv-comp.enabled" then (
-    let machine = match get_string "exp.architecture" with
+    Cil.envMachine := match get_string "exp.architecture" with
       | "32bit" -> Machdep.gcc32
       | "64bit" -> Machdep.gcc64
       | _ -> assert false
-    in
-    Machdep.theMachine := Option.get machine
   )
 
 let init () =

diff --git a/src/goblint.ml b/src/goblint.ml
@@ -5,8 +5,8 @@ open Maingoblint
 (** the main function *)
 let main () =
   try
-    Cilfacade.init ();
     Maingoblint.parse_arguments ();
+    Cilfacade.init ();
 
     (* Timing. *)
     Maingoblint.reset_stats ();