Skip to content

Commit 88fc61d

Browse files
davidpichardiefacebook-github-bot
authored andcommitted
[Java frontend] New Sawja 1.5.11 release
Reviewed By: ngorogiannis Differential Revision: D32016435 fbshipit-source-id: c18219ae0
1 parent 9061dec commit 88fc61d

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

infer/src/java/jTrans.ml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,10 @@ let get_jbir_representation cm bytecode =
337337
bytecode.JCode.c_local_variable_table
338338
in
339339
let fixed_bytecode = {bytecode with JCode.c_local_variable_table} in
340-
JBir.transform ~bcv:false ~ch_link:false ~formula:false ~formula_cmd:[] ~almost_ssa:true cm
341-
fixed_bytecode
340+
try JBir.transform ~bcv:false ~ch_link:false ~almost_ssa:true cm fixed_bytecode
341+
with Sawja_pack.Bir.Uninit_is_not_expr ->
342+
JBir.transform ~bcv:false ~ch_link:false ~almost_ssa:true ~folding:JBir.DoNotFold cm
343+
fixed_bytecode
342344

343345

344346
let pp_jbir fmt jbir =
@@ -1181,10 +1183,6 @@ let instruction (context : JContext.t) pc instr : translation =
11811183
MonitorExit
11821184
| Nop ->
11831185
Skip
1184-
| Formula _ ->
1185-
(* Sawja formulas are not generated with the current used
1186-
flags '~formula:false' *)
1187-
Skip
11881186
| Check _ ->
11891187
Skip
11901188
| MayInit _ ->

opam/infer.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ depends: [
4747
"ppx_expect" {>= "v0.14.0" & < "v0.15"}
4848
"ppx_fields_conv" {>= "v0.14.0" & < "v0.15"}
4949
"ppx_yojson_conv" {>= "v0.14.0" & < "v0.15"}
50-
"sawja" {>="1.5.10"}
50+
"sawja" {>="1.5.11"}
5151
"sqlite3"
5252
"utop" {with-test}
5353
"xmlm" {>="1.2.0"}

opam/infer.opam.locked

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ depends: [
133133
"re" {= "1.9.0"}
134134
"react" {= "1.2.1" & with-test}
135135
"result" {= "1.5"}
136-
"sawja" {= "1.5.10"}
136+
"sawja" {= "1.5.11"}
137137
"seq" {= "base"}
138138
"sexplib" {= "v0.14.0"}
139139
"sexplib0" {= "v0.14.0"}

0 commit comments

Comments
 (0)