reomove Sys.getenv ad-hoc processing

Author: bobzhang

jscomp/core/lam_compile.ml

@@ -1564,27 +1564,6 @@ and
         | NeedValue, _ ->
           Js_output.make block ~value:E.unit
       end
-    | (Ltrywith(
-        (Lprim {primitive = Pccall {prim_name = "caml_sys_getenv"; _};
-                args = [Lconst _]} as body),
-        id,
-        Lifthenelse
-          (Lprim{primitive = Pintcomp(Ceq);
-                 args = [Lvar id2 ;
-                         Lprim{primitive = Pglobal_exception {name = "Not_found"}; _}]},
-           cont, _reraise )
-      )
-      | Ltrywith(
-          (Lprim {primitive = Pccall {prim_name = "caml_sys_getenv"; _};
-                  args = [Lconst _]} as body),
-          id,
-          Lifthenelse(Lprim{primitive = Pintcomp(Ceq);
-                            args = [
-                              Lprim { primitive = Pglobal_exception {name = "Not_found"; _}; _}; Lvar id2 ]},
-                      cont, _reraise )
-        )) when Ident.same id id2
-      ->
-      compile_lambda cxt (Lam.try_ body id cont)
     | Ltrywith(lam,id, catch) ->  (* generate documentation *)
       (*
          tail --> should be renamed to `shouldReturn`

jscomp/test/caml_sys_poly_fill_test.js

@@ -4,6 +4,7 @@ var Mt = require("./mt.js");
 var Block = require("../../lib/js/block.js");
 var Caml_sys = require("../../lib/js/caml_sys.js");
 var Node_process = require("../../lib/js/node_process.js");
+var Caml_builtin_exceptions = require("../../lib/js/caml_builtin_exceptions.js");
 
 var suites = [/* [] */0];
 
@@ -46,7 +47,11 @@ try {
   tmp = Caml_sys.caml_sys_getenv("caml_sys_poly_fill_test.ml");
 }
 catch (exn){
-  tmp = "Z";
+  if (exn === Caml_builtin_exceptions.not_found) {
+    tmp = "Z";
+  } else {
+    throw exn;
+  }
 }
 
 eq("File \"caml_sys_poly_fill_test.ml\", line 23, characters 5-12", "Z", tmp);

lib/js/filename.js

@@ -131,7 +131,11 @@ try {
   temp_dir_name = Caml_sys.caml_sys_getenv("TMPDIR");
 }
 catch (exn){
-  temp_dir_name = "/tmp";
+  if (exn === Caml_builtin_exceptions.not_found) {
+    temp_dir_name = "/tmp";
+  } else {
+    throw exn;
+  }
 }
 
 function quote(param) {
@@ -165,7 +169,11 @@ try {
   temp_dir_name$1 = Caml_sys.caml_sys_getenv("TEMP");
 }
 catch (exn$1){
-  temp_dir_name$1 = ".";
+  if (exn$1 === Caml_builtin_exceptions.not_found) {
+    temp_dir_name$1 = ".";
+  } else {
+    throw exn$1;
+  }
 }
 
 var temp_dir_name$2 = temp_dir_name;

lib/whole_compiler.ml

@@ -97858,16 +97858,20 @@ and compile_general_cases
               (fun group ->
                  Ext_list.map_last
                    (fun last (switch_case,lam) ->
-                      let switch_block, should_break  =
+                      (* let switch_block, should_break  =
                         Js_output.to_break_block (compile_lambda cxt lam) in
                       let should_break =
                         match cxt.should_return with
                         | ReturnFalse -> should_break
                         | ReturnTrue _ -> false
-                      in
+                      in *)
+
                       if last
-                      then {J.switch_case ;
-                            switch_body = switch_block, should_break
+                      then
+                        (* merge and shared *)
+                        let switch_body = Js_output.to_break_block (compile_lambda cxt lam) in
+                        {J.switch_case ;
+                            switch_body
                             }
                       else
                         { switch_case; switch_body = [],false }
@@ -98930,27 +98934,6 @@ and
         | NeedValue, _ ->
           Js_output.make block ~value:E.unit
       end
-    | (Ltrywith(
-        (Lprim {primitive = Pccall {prim_name = "caml_sys_getenv"; _};
-                args = [Lconst _]} as body),
-        id,
-        Lifthenelse
-          (Lprim{primitive = Pintcomp(Ceq);
-                 args = [Lvar id2 ;
-                         Lprim{primitive = Pglobal_exception {name = "Not_found"}; _}]},
-           cont, _reraise )
-      )
-      | Ltrywith(
-          (Lprim {primitive = Pccall {prim_name = "caml_sys_getenv"; _};
-                  args = [Lconst _]} as body),
-          id,
-          Lifthenelse(Lprim{primitive = Pintcomp(Ceq);
-                            args = [
-                              Lprim { primitive = Pglobal_exception {name = "Not_found"; _}; _}; Lvar id2 ]},
-                      cont, _reraise )
-        )) when Ident.same id id2
-      ->
-      compile_lambda cxt (Lam.try_ body id cont)
     | Ltrywith(lam,id, catch) ->  (* generate documentation *)
       (*
          tail --> should be renamed to `shouldReturn`