diff --git a/infer/src/backend/RestartScheduler.ml b/infer/src/backend/RestartScheduler.ml
index 26f2931e7..4a2a5c076 100644
--- a/infer/src/backend/RestartScheduler.ml
+++ b/infer/src/backend/RestartScheduler.ml
@@ -5,25 +5,20 @@
  * LICENSE file in the root directory of this source tree.
  *)
 open! IStd
-
-[@@@warning "-60"]
+module L = Logging
 
 module ProcLocker : sig
   val setup : unit -> unit
-    [@@warning "-32"]
   (** This should be called once before trying to lock Anything. *)
 
   val try_lock : Procname.t -> bool
-    [@@warning "-32"]
-  (** true = the lock belongs to the calling process false = the lock belongs to a different worker *)
+  (** true = the lock belongs to the calling process. false = the lock belongs to a different worker *)
 
   val unlock : Procname.t -> unit
-    [@@warning "-32"]
   (** This will work as a cleanup function because after calling unlock all the workers that need an
       unlocked Proc should find it's summary already Cached. Throws if the lock had not been taken. *)
 
   val clean : unit -> unit
-    [@@warning "-32"]
   (** This should be called when locks will no longer be used to remove any files or state that's
       not necessary. *)
 end = struct
@@ -41,7 +36,7 @@ let of_list (lst : 'a list) : 'a ProcessPool.TaskGenerator.t =
   let remaining = ref (Queue.length content) in
   let remaining_tasks () = !remaining in
   let is_empty () = Queue.is_empty content in
-  let finished ~completed:_ _work = decr remaining in
+  let finished ~completed work = if completed then decr remaining else Queue.enqueue content work in
   let next () = Queue.dequeue content in
   {remaining_tasks; is_empty; finished; next}
 
@@ -66,3 +61,39 @@ let make_with_procs_from sources =
 
 let make sources =
   ProcessPool.TaskGenerator.chain (make_with_procs_from sources) (FileScheduler.make sources)
+
+
+let locked_procs = Stack.create ()
+
+let unlock_all () = Stack.until_empty locked_procs ProcLocker.unlock
+
+let record_locked_proc (pname : Procname.t) = Stack.push locked_procs pname
+
+let if_restart_scheduler f =
+  match Config.scheduler with File | SyntacticCallGraph -> () | Restart -> f ()
+
+
+let lock_exn pname =
+  if_restart_scheduler (fun () ->
+      if ProcLocker.try_lock pname then record_locked_proc pname
+      else (
+        unlock_all () ;
+        raise ProcessPool.ProcnameAlreadyLocked ) )
+
+
+let unlock pname =
+  if_restart_scheduler (fun () ->
+      match Stack.pop locked_procs with
+      | None ->
+          L.die InternalError "Trying to unlock %s but it does not appear to be locked.@."
+            (Procname.to_string pname)
+      | Some stack_pname when not (Procname.equal pname stack_pname) ->
+          L.die InternalError "Trying to unlock %s but top of stack is %s.@."
+            (Procname.to_string pname) (Procname.to_string stack_pname)
+      | Some _ ->
+          ProcLocker.unlock pname )
+
+
+let setup () = ProcLocker.setup ()
+
+let clean () = ProcLocker.clean ()
diff --git a/infer/src/backend/RestartScheduler.mli b/infer/src/backend/RestartScheduler.mli
index d4b8fc626..56256e8cb 100644
--- a/infer/src/backend/RestartScheduler.mli
+++ b/infer/src/backend/RestartScheduler.mli
@@ -6,4 +6,12 @@
  *)
 open! IStd
 
+val setup : unit -> unit
+
+val clean : unit -> unit
+
+val lock_exn : Procname.t -> unit
+
+val unlock : Procname.t -> unit
+
 val make : SourceFile.t list -> SchedulerTypes.target ProcessPool.TaskGenerator.t
diff --git a/infer/src/backend/Tasks.ml b/infer/src/backend/Tasks.ml
index 9ed9e8d20..4379db851 100644
--- a/infer/src/backend/Tasks.ml
+++ b/infer/src/backend/Tasks.ml
@@ -34,7 +34,9 @@ module Runner = struct
     Stdlib.flush_all () ;
     (* Compact heap before forking *)
     Gc.compact () ;
-    ProcessPool.run runner
+    RestartScheduler.setup () ;
+    let results = ProcessPool.run runner in
+    RestartScheduler.clean () ; results
 end
 
 let run_sequentially ~(f : 'a doer) (tasks : 'a list) : unit =
diff --git a/infer/src/backend/ondemand.ml b/infer/src/backend/ondemand.ml
index 55e8d8068..4e83ecfe2 100644
--- a/infer/src/backend/ondemand.ml
+++ b/infer/src/backend/ondemand.ml
@@ -337,10 +337,14 @@ let analyze_callee ?caller_summary callee =
           if callee_should_be_analyzed callee then
             match get_callee_proc_desc callee with
             | Some callee_pdesc ->
-                Some
-                  (run_proc_analysis
-                     ~caller_pdesc:(Option.map ~f:Summary.get_proc_desc caller_summary)
-                     callee_pdesc)
+                RestartScheduler.lock_exn callee_pname ;
+                let callee_summary =
+                  run_proc_analysis
+                    ~caller_pdesc:(Option.map ~f:Summary.get_proc_desc caller_summary)
+                    callee_pdesc
+                in
+                RestartScheduler.unlock callee_pname ;
+                Some callee_summary
             | None ->
                 Summary.OnDisk.get callee_pname
           else (
diff --git a/infer/src/base/ProcessPool.ml b/infer/src/base/ProcessPool.ml
index aceba3bc2..6a336396f 100644
--- a/infer/src/base/ProcessPool.ml
+++ b/infer/src/base/ProcessPool.ml
@@ -9,6 +9,8 @@ open! IStd
 module F = Format
 module L = Logging
 
+exception ProcnameAlreadyLocked
+
 module TaskGenerator = struct
   type 'a t =
     { remaining_tasks: unit -> int
@@ -349,20 +351,24 @@ let rec child_loop ~slot send_to_parent send_final receive_from_parent ~f ~epilo
               send_final (FinalCrash slot) ;
               true ) ) )
   | Do stuff ->
-      ( try f stuff
-        with e ->
-          IExn.reraise_if e ~f:(fun () ->
-              if Config.keep_going then (
-                L.internal_error "Error in subprocess %d: %a@." slot Exn.pp e ;
-                (* do not raise and continue accepting jobs *)
-                false )
-              else (
-                (* crash hard, but first let the master know that we have crashed *)
-                send_to_parent (Crash slot) ;
-                true ) ) ) ;
-      (* This is temporary. prev_completed should contain the return value of f stuff *)
+      let result =
+        try f stuff ; true with
+        | ProcnameAlreadyLocked ->
+            false
+        | e ->
+            IExn.reraise_if e ~f:(fun () ->
+                if Config.keep_going then (
+                  L.internal_error "Error in subprocess %d: %a@." slot Exn.pp e ;
+                  (* do not raise and continue accepting jobs *)
+                  false )
+                else (
+                  (* crash hard, but first let the master know that we have crashed *)
+                  send_to_parent (Crash slot) ;
+                  true ) ) ;
+            true
+      in
       child_loop ~slot send_to_parent send_final receive_from_parent ~f ~epilogue
-        ~prev_completed:true
+        ~prev_completed:result
 
 
 (** Fork a new child and start it so that it is ready for work.
diff --git a/infer/src/base/ProcessPool.mli b/infer/src/base/ProcessPool.mli
index 074f13d82..8fe7b8a86 100644
--- a/infer/src/base/ProcessPool.mli
+++ b/infer/src/base/ProcessPool.mli
@@ -7,6 +7,8 @@
 
 open! IStd
 
+exception ProcnameAlreadyLocked
+
 module TaskGenerator : sig
   (** abstraction for generating jobs *)
   type 'a t =