From 091f31dd17cacd09c9d397aac20cd78ac464d62a Mon Sep 17 00:00:00 2001
From: Sam Blackshear <shb@fb.com>
Date: Wed, 17 Feb 2016 08:29:55 -0800
Subject: [PATCH] translating monitor exit/enter

Reviewed By: jeremydubreil

Differential Revision: D2940954

fb-gh-sync-id: d3b0b40
shipit-source-id: d3b0b40
---
 infer/src/backend/symExec.ml  |  6 ++++--
 infer/src/backend/symExec.mli |  2 ++
 infer/src/java/jTrans.ml      | 15 ++++++++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/infer/src/backend/symExec.ml b/infer/src/backend/symExec.ml
index 33e45dad9..196758e8a 100644
--- a/infer/src/backend/symExec.ml
+++ b/infer/src/backend/symExec.ml
@@ -2564,9 +2564,11 @@ module ModelBuiltins = struct
   (* set the attribute of the parameter as untainted *)
   let _ = Builtin.register "__set_untaint_attribute" (execute___set_attr Sil.Auntaint)
   (* set the attribute of the parameter as locked *)
-  let _ = Builtin.register "__set_locked_attribute" (execute___set_attr Sil.Alocked)
+  let __set_locked_attribute =
+    Builtin.register "__set_locked_attribute" (execute___set_attr Sil.Alocked)
   (* set the attribute of the parameter as unlocked *)
-  let _ = Builtin.register "__set_unlocked_attribute" (execute___set_attr Sil.Aunlocked)
+  let __set_unlocked_attribute =
+    Builtin.register "__set_unlocked_attribute" (execute___set_attr Sil.Aunlocked)
   let _ = Builtin.register "__check_untainted" execute___check_untainted (* report a taint error if the parameter is tainted, and assume it is untainted afterward *)
   let __objc_retain = Builtin.register "__objc_retain" execute___objc_retain (* objective-c "retain" *)
   let __objc_release = Builtin.register "__objc_release" execute___objc_release (* objective-c "release" *)
diff --git a/infer/src/backend/symExec.mli b/infer/src/backend/symExec.mli
index e39ddff0c..4a1172bf8 100644
--- a/infer/src/backend/symExec.mli
+++ b/infer/src/backend/symExec.mli
@@ -47,6 +47,8 @@ module ModelBuiltins : sig
   val __unwrap_exception : Procname.t
   val __set_file_attribute : Procname.t
   val __set_mem_attribute : Procname.t
+  val __set_locked_attribute : Procname.t
+  val __set_unlocked_attribute : Procname.t
   val __infer_assume : Procname.t
   val __objc_retain : Procname.t
   val __objc_release : Procname.t
diff --git a/infer/src/java/jTrans.ml b/infer/src/java/jTrans.ml
index 619c392f2..29dd0e9ac 100644
--- a/infer/src/java/jTrans.ml
+++ b/infer/src/java/jTrans.ml
@@ -771,7 +771,6 @@ let assume_not_null loc sil_expr =
   let call_args = [(not_null_expr, Sil.Tint Sil.IBool)] in
   Sil.Call ([], builtin_infer_assume, call_args, loc, assume_call_flag)
 
-
 let rec instruction context pc instr : translation =
   let cfg = JContext.get_cfg context in
   let tenv = JContext.get_tenv context in
@@ -790,6 +789,13 @@ let rec instruction context pc instr : translation =
   let return_not_null () =
     (match_never_null loc.Location.file proc_name
      || IList.exists (fun p -> Procname.equal p proc_name) JTransType.never_returning_null) in
+  let trans_monitor_enter_exit context expr pc loc builtin node_desc =
+    let sil_type = JTransType.expr_type context expr
+    and ids, instrs, sil_expr = expression context pc expr in
+    let builtin_const = Sil.Const (Sil.Cfun builtin) in
+    let instr = Sil.Call ([], builtin_const, [(sil_expr, sil_type)], loc, Sil.cf_default) in
+    let node_kind = Cfg.Node.Stmt_node node_desc in
+    Instr (create_node node_kind ids (instrs @ [instr])) in
   try
     match instr with
     | JBir.AffectVar (var, expr) ->
@@ -1115,6 +1121,13 @@ let rec instruction context pc instr : translation =
           create_node throw_cast_exception_kind (ids @ call_ids) cce_instrs in
 
         Prune (is_instance_node, throw_cast_exception_node)
+    | JBir.MonitorEnter expr ->
+        trans_monitor_enter_exit
+          context expr pc loc SymExec.ModelBuiltins.__set_locked_attribute "MonitorEnter"
+
+    | JBir.MonitorExit expr ->
+        trans_monitor_enter_exit
+          context expr pc loc SymExec.ModelBuiltins.__set_unlocked_attribute "MonitorExit"
 
     | _ -> Skip
   with Frontend_error s ->