Add state option to control AUTO_REFS and stuff; disable by default

rhelmot · rhelmot · commit f98c63bf623c · 2022-07-18T16:42:22.000-07:00
diff --git a/angr/engines/procedure.py b/angr/engines/procedure.py
@@ -28,7 +28,7 @@ def process_procedure(self, state, successors, procedure, ret_to=None, arguments
         if procedure.is_syscall:
             state._inspect('syscall', BP_BEFORE, syscall_name=procedure.display_name)
 
-        cleanup_options = o.AUTO_REFS not in state.options
+        cleanup_options = o.AUTO_REFS not in state.options and o.ADD_AUTO_REFS in state.options
         if cleanup_options:
             state.options.add(o.AST_DEPS)
             state.options.add(o.AUTO_REFS)
diff --git a/angr/sim_options.py b/angr/sim_options.py
@@ -112,6 +112,7 @@
 
 # this is an internal option to automatically track dependencies in SimProcedures
 AUTO_REFS = "AUTO_REFS"
+ADD_AUTO_REFS = "ADD_AUTO_REFS"
 
 # Whether we should track dependencies in SimActions
 # If none of the ref options above exist, this option does nothing
