[Java frontend] new Sawja 1.5.10 release

Reviewed By: ngorogiannis, jvillard

Differential Revision: D31543918

fbshipit-source-id: dde0fc570

Author: davidpichardie

CONTRIBUTING.md

@@ -220,11 +220,11 @@ $ firefox infer-out/captured/hello.c.*.html
 
 ## Updating infer.opam and infer.opam.locked
 
-tl; dr: Run `make opam/infer.opam.locked`.
-
-infer.opam.locked records fixed versions of the opam dependencies known to work with infer and to respect
-the constraints in opam. This prevents unpredictable breakages of infer or its dependencies,
-especially for infer releases, for which it is more difficult to change their package constraints
-after the fact.
-
-To add an opam package or update its version constraints, edit 'infer.opam' then run `make infer.opam.locked`.
+`opam/infer.opam.locked` records fixed versions of the opam
+dependencies known to work with infer and to respect the constraints
+in opam. This prevents unpredictable breakages of infer or its
+dependencies, especially for infer releases, for which it is more
+difficult to change their package constraints after the fact.
+
+To add an opam package or update its version constraints, edit
+`opam/infer.opam` then run `opam lock .` in directory `opam/`.

Makefile

@@ -890,17 +890,6 @@ conf-clean: clean
 	$(REMOVE_DIR) $(MODELS_DIR)/java/infer-out/
 	$(REMOVE_DIR) $(MODELS_DIR)/objc/out/
 
-
-# phony because it depends on opam's internal state
-.PHONY: opam/infer.opam.locked
-opam/infer.opam.locked: opam/infer.opam
-# allow users to not force a run of opam update since it's very slow
-ifeq ($(NO_OPAM_UPDATE),)
-	$(QUIET)$(call silent_on_success,opam update,$(OPAM) update)
-endif
-	$(QUIET)$(call silent_on_success,generating opam/infer.opam.locked,\
-	  $(OPAM) lock opam/infer.opam)
-
 OPAM_DEV_DEPS = ocp-indent merlin utop webbrowser
 
 ifneq ($(EMACS),no)

infer/src/java/jTrans.ml

@@ -946,6 +946,38 @@ let instruction (context : JContext.t) pc instr : translation =
     let procname_string = Procname.to_string procname in
     Procdesc.Node.Stmt_node (Call procname_string)
   in
+  let build_alloc var cn constructor_opt =
+    let builtin_new = Exp.Const (Const.Cfun BuiltinDecl.__new) in
+    let class_type = JTransType.get_class_type program tenv cn in
+    let class_type_np = JTransType.get_class_type_no_pointer program tenv cn in
+    let sizeof_exp =
+      Exp.Sizeof {typ= class_type_np; nbytes= None; dynamic_length= None; subtype= Subtype.exact}
+    in
+    let args = [(sizeof_exp, class_type)] in
+    let ret_id = Ident.create_fresh Ident.knormal in
+    let new_instr = Sil.Call ((ret_id, class_type), builtin_new, args, loc, CallFlags.default) in
+    let pvar = JContext.set_pvar context var class_type in
+    let set_instr =
+      Sil.Store {e1= Exp.Lvar pvar; root_typ= class_type; typ= class_type; e2= Exp.Var ret_id; loc}
+    in
+    match constructor_opt with
+    | Some (constr_type_list, constr_arg_list) ->
+        let constr_ms = JBasics.make_ms JConfig.constructor_name constr_type_list None in
+        let constr_procname, call_instrs =
+          let ret_opt = Some (Exp.Var ret_id, class_type) in
+          method_invocation context loc pc None cn constr_ms ret_opt constr_arg_list I_Special
+            Procname.Java.Non_Static
+        in
+        let instrs = (new_instr :: call_instrs) @ [set_instr] in
+        let node_kind = create_node_kind constr_procname in
+        let node = create_node node_kind instrs in
+        Instr node
+    | None ->
+        let instrs = [new_instr; set_instr] in
+        let node_kind = Procdesc.Node.Stmt_node MethodBody in
+        let node = create_node node_kind instrs in
+        Instr node
+  in
   try
     match (instr : JBir.instr) with
     | AffectVar (var, expr) ->
@@ -1063,33 +1095,11 @@ let instruction (context : JContext.t) pc instr : translation =
         let node = create_node Procdesc.Node.throw_kind (instrs @ [sil_instr]) in
         JContext.add_goto_jump context pc JContext.Exit ;
         Instr node
+    | Alloc (var, cn) ->
+        (* since Sawja 1.5.10 some allocation sites come without constructor calls *)
+        build_alloc var cn None
     | New (var, cn, constr_type_list, constr_arg_list) ->
-        let builtin_new = Exp.Const (Const.Cfun BuiltinDecl.__new) in
-        let class_type = JTransType.get_class_type program tenv cn in
-        let class_type_np = JTransType.get_class_type_no_pointer program tenv cn in
-        let sizeof_exp =
-          Exp.Sizeof {typ= class_type_np; nbytes= None; dynamic_length= None; subtype= Subtype.exact}
-        in
-        let args = [(sizeof_exp, class_type)] in
-        let ret_id = Ident.create_fresh Ident.knormal in
-        let new_instr =
-          Sil.Call ((ret_id, class_type), builtin_new, args, loc, CallFlags.default)
-        in
-        let constr_ms = JBasics.make_ms JConfig.constructor_name constr_type_list None in
-        let constr_procname, call_instrs =
-          let ret_opt = Some (Exp.Var ret_id, class_type) in
-          method_invocation context loc pc None cn constr_ms ret_opt constr_arg_list I_Special
-            Procname.Java.Non_Static
-        in
-        let pvar = JContext.set_pvar context var class_type in
-        let set_instr =
-          Sil.Store
-            {e1= Exp.Lvar pvar; root_typ= class_type; typ= class_type; e2= Exp.Var ret_id; loc}
-        in
-        let instrs = (new_instr :: call_instrs) @ [set_instr] in
-        let node_kind = create_node_kind constr_procname in
-        let node = create_node node_kind instrs in
-        Instr node
+        build_alloc var cn (Some (constr_type_list, constr_arg_list))
     | NewArray (var, vt, expr_list) ->
         let builtin_new_array = Exp.Const (Const.Cfun BuiltinDecl.__new_array) in
         let content_type = JTransType.value_type program tenv vt in

opam/infer.opam

@@ -47,7 +47,7 @@ depends: [
   "ppx_expect" {>= "v0.14.0" & < "v0.15"}
   "ppx_fields_conv" {>= "v0.14.0" & < "v0.15"}
   "ppx_yojson_conv" {>= "v0.14.0" & < "v0.15"}
-  "sawja" {>="1.5.8"}
+  "sawja" {>="1.5.10"}
   "sqlite3"
   "utop" {with-test}
   "xmlm" {>="1.2.0"}

opam/infer.opam.locked

@@ -40,6 +40,8 @@ depends: [
   "biniou" {= "1.2.1"}
   "camlidl" {= "1.09"}
   "camlzip" {= "1.10"}
+  "camomile" {= "1.0.2" & with-test}
+  "charInfo_width" {= "1.1.0" & with-test}
   "cmdliner" {= "1.0.4"}
   "conf-autoconf" {= "0.1"}
   "conf-gmp" {= "3"}
@@ -64,11 +66,18 @@ depends: [
   "jane-street-headers" {= "v0.14.0"}
   "javalib" {= "3.2.1"}
   "jst-config" {= "v0.14.0"}
+  "lambda-term" {= "3.1.0" & with-test}
+  "lwt" {= "5.4.2" & with-test}
+  "lwt_log" {= "1.1.1" & with-test}
+  "lwt_react" {= "1.1.4" & with-test}
   "memtrace" {= "0.2.1.2"}
   "menhir" {= "20210419"}
   "menhirLib" {= "20210419"}
   "menhirSdk" {= "20210419"}
+  "mew" {= "0.1.0" & with-test}
+  "mew_vi" {= "0.5.0" & with-test}
   "mlgmpidl" {= "1.2.13"}
+  "mmap" {= "1.1.0" & with-test}
   "mtime" {= "1.2.0"}
   "num" {= "1.4"}
   "ocaml" {= "4.12.0"}
@@ -80,6 +89,7 @@ depends: [
   "ocamlbuild" {= "0.14.0"}
   "ocamlfind" {= "1.9.1"}
   "ocamlgraph" {= "2.0.0"}
+  "ocplib-endian" {= "1.1" & with-test}
   "octavius" {= "1.2.2"}
   "ounit" {= "2.2.4"}
   "ounit2" {= "2.2.4"}
@@ -121,8 +131,9 @@ depends: [
   "ppxlib" {= "0.22.0"}
   "protocol_version_header" {= "v0.14.0"}
   "re" {= "1.9.0"}
+  "react" {= "1.2.1" & with-test}
   "result" {= "1.5"}
-  "sawja" {= "1.5.8"}
+  "sawja" {= "1.5.10"}
   "seq" {= "base"}
   "sexplib" {= "v0.14.0"}
   "sexplib0" {= "v0.14.0"}
@@ -135,11 +146,14 @@ depends: [
   "time_now" {= "v0.14.0"}
   "timezone" {= "v0.14.0"}
   "topkg" {= "1.0.3"}
+  "trie" {= "1.0.0" & with-test}
   "typerep" {= "v0.14.0"}
+  "utop" {= "2.8.0" & with-test}
   "variantslib" {= "v0.14.0"}
   "xmlm" {= "1.3.0"}
   "yojson" {= "1.7.0"}
   "zarith" {= "1.12"}
+  "zed" {= "3.1.0" & with-test}
 ]
 depexts: [
   [ ["ubuntu"] ["default-jdk"] ]