Merge pull request #3879 from BuckleScript/gpr_3875

Fix #3875

Author: bobzhang

jscomp/core/lam_compile.ml

@@ -760,7 +760,9 @@ and compile_staticcatch (lam : Lam.t) (lambda_cxt  : Lam_compile_context.t)=
     let exit_id = Ext_ident.create_tmp ~name:"exit" () in
     match lambda_cxt.continuation, code_table with         
     | EffectCall (Maybe_tail_is_return (Tail_with_name ({in_staticcatch = false} as z))),
-      [ code_table ]  (* tail position and only one exit code *) 
+      [ code_table ]  
+      (* tail position and only one exit code *) 
+      when Lam_compile_context.no_static_raise_in_handler code_table
       ->
       let jmp_table, handler = 
           Lam_compile_context.add_pseudo_jmp

jscomp/core/lam_compile_context.ml

@@ -99,6 +99,10 @@ type handler = {
   bindings : Ident.t list; 
 }
 
+let no_static_raise_in_handler (x : handler) : bool =
+  not (Lam_exit_code.has_exit_code 
+         x.handler (fun _code -> true))
+
 (* always keep key id positive, specifically no [0] generated 
    return a tuple
    [tbl, handlers]

jscomp/core/lam_compile_context.mli

@@ -106,6 +106,10 @@ type handler = {
   bindings : Ident.t list; 
 } 
 
+val no_static_raise_in_handler : 
+  handler -> 
+  bool 
+  
 val add_jmps :
   jmp_table -> 
   Ident.t ->

jscomp/test/build.ninja

@@ -304,6 +304,7 @@ build test/gpr_3852_effect.cmi test/gpr_3852_effect.cmj : cc test/gpr_3852_effec
 build test/gpr_3865.cmi test/gpr_3865.cmj : cc test/gpr_3865.re | test/gpr_3865_bar.cmj test/gpr_3865_foo.cmj $stdlib
 build test/gpr_3865_bar.cmi test/gpr_3865_bar.cmj : cc test/gpr_3865_bar.re | $stdlib
 build test/gpr_3865_foo.cmi test/gpr_3865_foo.cmj : cc test/gpr_3865_foo.re | $stdlib
+build test/gpr_3875_test.cmi test/gpr_3875_test.cmj : cc test/gpr_3875_test.ml | test/mt.cmj $stdlib
 build test/gpr_405_test.cmj : cc_cmi test/gpr_405_test.ml | test/gpr_405_test.cmi $stdlib
 build test/gpr_405_test.cmi : cc test/gpr_405_test.mli | $stdlib
 build test/gpr_441.cmi test/gpr_441.cmj : cc test/gpr_441.ml | $stdlib