Don't use Lam_analysis.no_side_effects here

Author: cknitt

compiler/core/lam_util.ml

@@ -45,12 +45,12 @@ let refine_let ~kind param (arg : Lam.t) (l : Lam.t) : Lam.t =
     | Lam_primitive.Pmakeblock _ -> true
     | _ -> false
   in
-  let is_safe_to_inline (lam : Lam.t) =
+  let rec is_safe_to_alias (lam : Lam.t) =
     match lam with
     | Lvar _ | Lconst _ -> true
-    | Lprim { primitive = Psome_not_nest; args = [inner]; _ } ->
-        Lam_analysis.no_side_effects inner
     | Lprim { primitive = Pfield (_, Fld_module _); args = [ (Lglobal_module _ | Lvar _) ]; _ } -> true
+    | Lprim { primitive = Psome_not_nest; args = [inner]; _ } ->
+        is_safe_to_alias inner
     | _ -> false
   in
   match (kind : Lam_compat.let_kind), arg, l with
@@ -72,7 +72,7 @@ let refine_let ~kind param (arg : Lam.t) (l : Lam.t) : Lam.t =
          rewrite to `someFn(value)` as long as the callee does not capture `x`.
          This removes the temporary binding while preserving the call semantics. *)
       Lam.apply fn [arg] ap_info ~ap_transformed_jsx
-  | (Strict | StrictOpt), arg, _ when is_safe_to_inline arg ->
+  | (Strict | StrictOpt), arg, _ when is_safe_to_alias arg ->
       (* `Strict` and `StrictOpt` bindings both evaluate the RHS immediately
          (with `StrictOpt` allowing later elimination if unused). When that RHS
          is pure — `{ let x = Some(value); ... }`, `{ let x = 3; ... }`, or a module

tests/gentype_tests/typescript-react-example/src/nested/Types.res.js

@@ -8,6 +8,14 @@ let x6 = {
   x: 42
 };
 
+let x7 = [
+  1,
+  2,
+  3
+];
+
+let x8 = () => {};
+
 let x10 = null;
 
 let x11 = Primitive_option.some(undefined);
@@ -16,6 +24,8 @@ let x20 = null;
 
 let x21 = new Date();
 
+let x22 = /test/;
+
 let x23 = new Map();
 
 let x24 = new Set();
@@ -58,6 +68,8 @@ let x43 = new Intl.Locale("en");
 
 let x45 = Promise.resolve(true);
 
+let x47 = {};
+
 let x48 = Stdlib_Lazy.make(() => true);
 
 let x1 = "hello";
@@ -75,18 +87,8 @@ let x5 = {
   x: 42
 };
 
-let x7 = [
-  1,
-  2,
-  3
-];
-
-let x8 = () => {};
-
 let x12 = "test";
 
-let x22 = /test/;
-
 let x39 = true;
 
 let x44 = [
@@ -96,8 +98,6 @@ let x44 = [
 
 let x46 = /* [] */0;
 
-let x47 = {};
-
 export {
   x1,
   x2,

tests/tests/src/option_wrapping_test.mjs

@@ -92,6 +92,17 @@ function wrapReasonForJs(component, jsPropsToReason) {
 let dummyInteropComponent = basicComponent("interop");
 
 function wrapJsForReason(reactClass, props, children) {
+  let jsElementWrapped = (extra, extra$1) => {
+    let props$1 = Object.assign(Object.assign({}, props), {
+      ref: extra$1,
+      key: extra
+    });
+    let varargs = Js_array.concat(children, [
+      reactClass,
+      props$1
+    ]);
+    return React.createElement.apply(null, varargs);
+  };
   return {
     debugName: dummyInteropComponent.debugName,
     reactClassInternal: dummyInteropComponent.reactClassInternal,
@@ -106,17 +117,7 @@ function wrapJsForReason(reactClass, props, children) {
     initialState: dummyInteropComponent.initialState,
     retainedProps: dummyInteropComponent.retainedProps,
     reducer: dummyInteropComponent.reducer,
-    jsElementWrapped: (extra, extra$1) => {
-      let props$1 = Object.assign(Object.assign({}, props), {
-        ref: extra$1,
-        key: extra
-      });
-      let varargs = Js_array.concat(children, [
-        reactClass,
-        props$1
-      ]);
-      return React.createElement.apply(null, varargs);
-    }
+    jsElementWrapped: jsElementWrapped
   };
 }