[compiler][waittocommit] default to enablePropagateScopeDepsHIR

facebook · Oct 11, 2024 · 1c8e944 · 1c8e944
1 parent 9f35794
commit 1c8e944
Show file tree

Hide file tree

Showing 54 changed files with 554 additions and 509 deletions.
diff --git a/compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts b/compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts
@@ -230,7 +230,7 @@ const EnvironmentConfigSchema = z.object({
    */
   enableUseTypeAnnotations: z.boolean().default(false),
 
-  enablePropagateDepsInHIR: z.boolean().default(false),
+  enablePropagateDepsInHIR: z.boolean().default(true),
 
   /**
    * Enables inference of optional dependency chains. Without this flag

diff --git a/...ler/src/__tests__/fixtures/compiler/bug-invalid-hoisting-functionexpr.expect.md b/...ler/src/__tests__/fixtures/compiler/bug-invalid-hoisting-functionexpr.expect.md
@@ -58,7 +58,7 @@ function Component(t0) {
   const $ = _c(5);
   const { obj, isObjNull } = t0;
   let t1;
-  if ($[0] !== isObjNull || $[1] !== obj.prop) {
+  if ($[0] !== isObjNull || $[1] !== obj) {
     t1 = () => {
       if (!isObjNull) {
         return obj.prop;
@@ -67,7 +67,7 @@ function Component(t0) {
       }
     };
     $[0] = isObjNull;
-    $[1] = obj.prop;
+    $[1] = obj;
     $[2] = t1;
   } else {
     t1 = $[2];

diff --git a/...r/src/__tests__/fixtures/compiler/bug-try-catch-maybe-null-dependency.expect.md b/...r/src/__tests__/fixtures/compiler/bug-try-catch-maybe-null-dependency.expect.md
@@ -38,16 +38,24 @@ import { identity } from "shared-runtime";
  * try-catch block, as that might throw
  */
 function useFoo(maybeNullObject) {
-  const $ = _c(2);
+  const $ = _c(4);
   let y;
-  if ($[0] !== maybeNullObject.value.inner) {
+  if ($[0] !== maybeNullObject) {
     y = [];
     try {
-      y.push(identity(maybeNullObject.value.inner));
+      let t0;
+      if ($[2] !== maybeNullObject.value.inner) {
+        t0 = identity(maybeNullObject.value.inner);
+        $[2] = maybeNullObject.value.inner;
+        $[3] = t0;
+      } else {
+        t0 = $[3];
+      }
+      y.push(t0);
     } catch {
       y.push("null");
     }
-    $[0] = maybeNullObject.value.inner;
+    $[0] = maybeNullObject;
     $[1] = y;
   } else {
     y = $[1];

diff --git a/...eact-compiler/src/__tests__/fixtures/compiler/capturing-func-mutate-2.expect.md b/...eact-compiler/src/__tests__/fixtures/compiler/capturing-func-mutate-2.expect.md
@@ -37,15 +37,15 @@ function component(a, b) {
   }
   const y = t0;
   let z;
-  if ($[2] !== a || $[3] !== y.b) {
+  if ($[2] !== a || $[3] !== y) {
     z = { a };
     const x = function () {
       z.a = 2;
     };
 
     x();
     $[2] = a;
-    $[3] = y.b;
+    $[3] = y;
     $[4] = z;
   } else {
     z = $[4];

diff --git a/...ct-compiler/src/__tests__/fixtures/compiler/conditional-break-labeled.expect.md b/...ct-compiler/src/__tests__/fixtures/compiler/conditional-break-labeled.expect.md
@@ -33,9 +33,14 @@ import { c as _c } from "react/compiler-runtime"; /**
  * props.b *does* influence `a`
  */
 function Component(props) {
-  const $ = _c(2);
+  const $ = _c(5);
   let a;
-  if ($[0] !== props) {
+  if (
+    $[0] !== props.a ||
+    $[1] !== props.b ||
+    $[2] !== props.c ||
+    $[3] !== props.d
+  ) {
     a = [];
     a.push(props.a);
     bb0: {
@@ -47,10 +52,13 @@ function Component(props) {
     }
 
     a.push(props.d);
-    $[0] = props;
-    $[1] = a;
+    $[0] = props.a;
+    $[1] = props.b;
+    $[2] = props.c;
+    $[3] = props.d;
+    $[4] = a;
   } else {
-    a = $[1];
+    a = $[4];
   }
   return a;
 }

diff --git a/...act-compiler/src/__tests__/fixtures/compiler/conditional-early-return.expect.md b/...act-compiler/src/__tests__/fixtures/compiler/conditional-early-return.expect.md
@@ -70,10 +70,10 @@ import { c as _c } from "react/compiler-runtime"; /**
  * props.b does *not* influence `a`
  */
 function ComponentA(props) {
-  const $ = _c(3);
+  const $ = _c(5);
   let a_DEBUG;
   let t0;
-  if ($[0] !== props) {
+  if ($[0] !== props.a || $[1] !== props.b || $[2] !== props.d) {
     t0 = Symbol.for("react.early_return_sentinel");
     bb0: {
       a_DEBUG = [];
@@ -85,12 +85,14 @@ function ComponentA(props) {
 
       a_DEBUG.push(props.d);
     }
-    $[0] = props;
-    $[1] = a_DEBUG;
-    $[2] = t0;
+    $[0] = props.a;
+    $[1] = props.b;
+    $[2] = props.d;
+    $[3] = a_DEBUG;
+    $[4] = t0;
   } else {
-    a_DEBUG = $[1];
-    t0 = $[2];
+    a_DEBUG = $[3];
+    t0 = $[4];
   }
   if (t0 !== Symbol.for("react.early_return_sentinel")) {
     return t0;
@@ -102,20 +104,28 @@ function ComponentA(props) {
  * props.b *does* influence `a`
  */
 function ComponentB(props) {
-  const $ = _c(2);
+  const $ = _c(5);
   let a;
-  if ($[0] !== props) {
+  if (
+    $[0] !== props.a ||
+    $[1] !== props.b ||
+    $[2] !== props.c ||
+    $[3] !== props.d
+  ) {
     a = [];
     a.push(props.a);
     if (props.b) {
       a.push(props.c);
     }
 
     a.push(props.d);
-    $[0] = props;
-    $[1] = a;
+    $[0] = props.a;
+    $[1] = props.b;
+    $[2] = props.c;
+    $[3] = props.d;
+    $[4] = a;
   } else {
-    a = $[1];
+    a = $[4];
   }
   return a;
 }
@@ -124,10 +134,15 @@ function ComponentB(props) {
  * props.b *does* influence `a`, but only in a way that is never observable
  */
 function ComponentC(props) {
-  const $ = _c(3);
+  const $ = _c(6);
   let a;
   let t0;
-  if ($[0] !== props) {
+  if (
+    $[0] !== props.a ||
+    $[1] !== props.b ||
+    $[2] !== props.c ||
+    $[3] !== props.d
+  ) {
     t0 = Symbol.for("react.early_return_sentinel");
     bb0: {
       a = [];
@@ -140,12 +155,15 @@ function ComponentC(props) {
 
       a.push(props.d);
     }
-    $[0] = props;
-    $[1] = a;
-    $[2] = t0;
+    $[0] = props.a;
+    $[1] = props.b;
+    $[2] = props.c;
+    $[3] = props.d;
+    $[4] = a;
+    $[5] = t0;
   } else {
-    a = $[1];
-    t0 = $[2];
+    a = $[4];
+    t0 = $[5];
   }
   if (t0 !== Symbol.for("react.early_return_sentinel")) {
     return t0;
@@ -157,10 +175,15 @@ function ComponentC(props) {
  * props.b *does* influence `a`
  */
 function ComponentD(props) {
-  const $ = _c(3);
+  const $ = _c(6);
   let a;
   let t0;
-  if ($[0] !== props) {
+  if (
+    $[0] !== props.a ||
+    $[1] !== props.b ||
+    $[2] !== props.c ||
+    $[3] !== props.d
+  ) {
     t0 = Symbol.for("react.early_return_sentinel");
     bb0: {
       a = [];
@@ -173,12 +196,15 @@ function ComponentD(props) {
 
       a.push(props.d);
     }
-    $[0] = props;
-    $[1] = a;
-    $[2] = t0;
+    $[0] = props.a;
+    $[1] = props.b;
+    $[2] = props.c;
+    $[3] = props.d;
+    $[4] = a;
+    $[5] = t0;
   } else {
-    a = $[1];
-    t0 = $[2];
+    a = $[4];
+    t0 = $[5];
   }
   if (t0 !== Symbol.for("react.early_return_sentinel")) {
     return t0;

diff --git a/...react-compiler/src/__tests__/fixtures/compiler/conditional-on-mutable.expect.md b/...react-compiler/src/__tests__/fixtures/compiler/conditional-on-mutable.expect.md
@@ -36,9 +36,9 @@ function mayMutate() {}
 ```javascript
 import { c as _c } from "react/compiler-runtime";
 function ComponentA(props) {
-  const $ = _c(2);
+  const $ = _c(4);
   let t0;
-  if ($[0] !== props) {
+  if ($[0] !== props.p0 || $[1] !== props.p1 || $[2] !== props.p2) {
     const a = [];
     const b = [];
     if (b) {
@@ -49,18 +49,20 @@ function ComponentA(props) {
     }
 
     t0 = <Foo a={a} b={b} />;
-    $[0] = props;
-    $[1] = t0;
+    $[0] = props.p0;
+    $[1] = props.p1;
+    $[2] = props.p2;
+    $[3] = t0;
   } else {
-    t0 = $[1];
+    t0 = $[3];
   }
   return t0;
 }
 
 function ComponentB(props) {
-  const $ = _c(2);
+  const $ = _c(4);
   let t0;
-  if ($[0] !== props) {
+  if ($[0] !== props.p0 || $[1] !== props.p1 || $[2] !== props.p2) {
     const a = [];
     const b = [];
     if (mayMutate(b)) {
@@ -71,10 +73,12 @@ function ComponentB(props) {
     }
 
     t0 = <Foo a={a} b={b} />;
-    $[0] = props;
-    $[1] = t0;
+    $[0] = props.p0;
+    $[1] = props.p1;
+    $[2] = props.p2;
+    $[3] = t0;
   } else {
-    t0 = $[1];
+    t0 = $[3];
   }
   return t0;
 }

diff --git a/...tures/compiler/early-return-nested-early-return-within-reactive-scope.expect.md b/...tures/compiler/early-return-nested-early-return-within-reactive-scope.expect.md
@@ -31,22 +31,22 @@ export const FIXTURE_ENTRYPOINT = {
 ```javascript
 import { c as _c } from "react/compiler-runtime";
 function Component(props) {
-  const $ = _c(5);
+  const $ = _c(7);
   let t0;
-  if ($[0] !== props) {
+  if ($[0] !== props.cond || $[1] !== props.a || $[2] !== props.b) {
     t0 = Symbol.for("react.early_return_sentinel");
     bb0: {
       const x = [];
       if (props.cond) {
         x.push(props.a);
         if (props.b) {
           let t1;
-          if ($[2] !== props.b) {
+          if ($[4] !== props.b) {
             t1 = [props.b];
-            $[2] = props.b;
-            $[3] = t1;
+            $[4] = props.b;
+            $[5] = t1;
           } else {
-            t1 = $[3];
+            t1 = $[5];
           }
           const y = t1;
           x.push(y);
@@ -58,20 +58,22 @@ function Component(props) {
         break bb0;
       } else {
         let t1;
-        if ($[4] === Symbol.for("react.memo_cache_sentinel")) {
+        if ($[6] === Symbol.for("react.memo_cache_sentinel")) {
           t1 = foo();
-          $[4] = t1;
+          $[6] = t1;
         } else {
-          t1 = $[4];
+          t1 = $[6];
         }
         t0 = t1;
         break bb0;
       }
     }
-    $[0] = props;
-    $[1] = t0;
+    $[0] = props.cond;
+    $[1] = props.a;
+    $[2] = props.b;
+    $[3] = t0;
   } else {
-    t0 = $[1];
+    t0 = $[3];
   }
   if (t0 !== Symbol.for("react.early_return_sentinel")) {
     return t0;