Update

[ghstack-poisoned]
facebook · Sep 26, 2024 · 5f8e81e · 5f8e81e
2 parents b8b9de0 + d2a7be0
commit 5f8e81e
Show file tree

Hide file tree

Showing 30 changed files with 312 additions and 227 deletions.
diff --git a/compiler/packages/babel-plugin-react-compiler/src/HIR/CollectHoistablePropertyLoads.ts b/compiler/packages/babel-plugin-react-compiler/src/HIR/CollectHoistablePropertyLoads.ts
@@ -212,12 +212,12 @@ class PropertyPathRegistry {
 }
 
 function addNonNullPropertyPath(
-  node: PropertyPathNode,
+  source: Identifier,
+  sourceNode: PropertyPathNode,
   instrId: InstructionId,
   knownImmutableIdentifiers: Set<IdentifierId>,
   result: Set<PropertyPathNode>,
 ): void {
-  const object = node.fullPath.identifier;
   /**
    * Since this runs *after* buildReactiveScopeTerminals, identifier mutable ranges
    * are not valid with respect to current instruction id numbering.
@@ -229,14 +229,14 @@ function addNonNullPropertyPath(
    * See comment at top of function for why we track known immutable identifiers.
    */
   const isMutableAtInstr =
-    object.mutableRange.end > object.mutableRange.start + 1 &&
-    object.scope != null &&
-    inRange({id: instrId}, object.scope.range);
+    source.mutableRange.end > source.mutableRange.start + 1 &&
+    source.scope != null &&
+    inRange({id: instrId}, source.scope.range);
   if (
     !isMutableAtInstr ||
-    knownImmutableIdentifiers.has(node.fullPath.identifier.id)
+    knownImmutableIdentifiers.has(sourceNode.fullPath.identifier.id)
   ) {
-    result.add(node);
+    result.add(sourceNode);
   }
 }
 
@@ -299,9 +299,9 @@ function collectNonNullsInBlocks(
           identifier: instr.value.object.identifier,
           path: [],
         };
-        const propertyNode = registry.getOrCreateProperty(source);
         addNonNullPropertyPath(
-          propertyNode,
+          instr.value.object.identifier,
+          registry.getOrCreateProperty(source),
           instr.id,
           knownImmutableIdentifiers,
           assumedNonNullObjects,
@@ -314,6 +314,7 @@ function collectNonNullsInBlocks(
         const sourceNode = temporaries.get(source);
         if (sourceNode != null) {
           addNonNullPropertyPath(
+            instr.value.value.identifier,
             registry.getOrCreateProperty(sourceNode),
             instr.id,
             knownImmutableIdentifiers,
@@ -328,6 +329,7 @@ function collectNonNullsInBlocks(
         const sourceNode = temporaries.get(source);
         if (sourceNode != null) {
           addNonNullPropertyPath(
+            instr.value.object.identifier,
             registry.getOrCreateProperty(sourceNode),
             instr.id,
             knownImmutableIdentifiers,

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
diff --git a/...gin-react-compiler/src/__tests__/fixtures/compiler/bug-try-catch-maybe-null-dependency.ts b/...gin-react-compiler/src/__tests__/fixtures/compiler/bug-try-catch-maybe-null-dependency.ts
diff --git a/...-hir-fork/reduce-reactive-deps/infer-function-cond-access-not-hoisted.expect.md b/...-hir-fork/reduce-reactive-deps/infer-function-cond-access-not-hoisted.expect.md
@@ -4,13 +4,18 @@
 ```javascript
 // @enablePropagateDepsInHIR
 
-import { Stringify } from "shared-runtime";
+import {Stringify} from 'shared-runtime';
 
 function Foo({a, shouldReadA}) {
-  return <Stringify fn={() => {
-    if (shouldReadA) return a.b.c;
-    return null;
-  }} shouldInvokeFns={true} />
+  return (
+    <Stringify
+      fn={() => {
+        if (shouldReadA) return a.b.c;
+        return null;
+      }}
+      shouldInvokeFns={true}
+    />
+  );
 }
 
 export const FIXTURE_ENTRYPOINT = {

diff --git a/...agate-scope-deps-hir-fork/reduce-reactive-deps/infer-function-cond-access-not-hoisted.tsx b/...agate-scope-deps-hir-fork/reduce-reactive-deps/infer-function-cond-access-not-hoisted.tsx
@@ -1,12 +1,17 @@
 // @enablePropagateDepsInHIR
 
-import { Stringify } from "shared-runtime";
+import {Stringify} from 'shared-runtime';
 
 function Foo({a, shouldReadA}) {
-  return <Stringify fn={() => {
-    if (shouldReadA) return a.b.c;
-    return null;
-  }} shouldInvokeFns={true} />
+  return (
+    <Stringify
+      fn={() => {
+        if (shouldReadA) return a.b.c;
+        return null;
+      }}
+      shouldInvokeFns={true}
+    />
+  );
 }
 
 export const FIXTURE_ENTRYPOINT = {

diff --git a/...ps-hir-fork/reduce-reactive-deps/infer-function-uncond-access-hoisted.expect.md b/...ps-hir-fork/reduce-reactive-deps/infer-function-uncond-access-hoisted.expect.md
@@ -4,7 +4,7 @@
 ```javascript
 // @enablePropagateDepsInHIR
 
-import { Stringify } from "shared-runtime";
+import {Stringify} from 'shared-runtime';
 
 function useFoo(a) {
   return <Stringify fn={() => a.b.c} shouldInvokeFns={true} />;
@@ -28,9 +28,9 @@ import { Stringify } from "shared-runtime";
 function useFoo(a) {
   const $ = _c(2);
   let t0;
-  if ($[0] !== a.b.c) {
+  if ($[0] !== a) {
     t0 = <Stringify fn={() => a.b.c} shouldInvokeFns={true} />;
-    $[0] = a.b.c;
+    $[0] = a;
     $[1] = t0;
   } else {
     t0 = $[1];

diff --git a/...opagate-scope-deps-hir-fork/reduce-reactive-deps/infer-function-uncond-access-hoisted.tsx b/...opagate-scope-deps-hir-fork/reduce-reactive-deps/infer-function-uncond-access-hoisted.tsx
@@ -1,6 +1,6 @@
 // @enablePropagateDepsInHIR
 
-import { Stringify } from "shared-runtime";
+import {Stringify} from 'shared-runtime';
 
 function useFoo(a) {
   return <Stringify fn={() => a.b.c} shouldInvokeFns={true} />;

diff --git a/...rk/reduce-reactive-deps/infer-function-uncond-access-hoists-other-dep.expect.md b/...rk/reduce-reactive-deps/infer-function-uncond-access-hoists-other-dep.expect.md
@@ -4,7 +4,7 @@
 ```javascript
 // @enablePropagateDepsInHIR
 
-import { identity, makeArray, Stringify, useIdentity } from "shared-runtime";
+import {identity, makeArray, Stringify, useIdentity} from 'shared-runtime';
 
 function Foo({a, cond}) {
   // Assume fn will be uncond evaluated, so we can safely evaluate {a.<any>,
@@ -21,7 +21,11 @@ function Foo({a, cond}) {
 export const FIXTURE_ENTRYPOINT = {
   fn: Foo,
   params: [{a: null, cond: true}],
-  sequentialRenders: [{a: null, cond: true}, {a: {b: {c: 4}}, cond: true},  {a: {b: {c: 4}}, cond: true}],
+  sequentialRenders: [
+    {a: null, cond: true},
+    {a: {b: {c: 4}}, cond: true},
+    {a: {b: {c: 4}}, cond: true},
+  ],
 };
 
 ```
@@ -47,13 +51,13 @@ function Foo(t0) {
   const fn = t1;
   useIdentity(null);
   let x;
-  if ($[2] !== cond || $[3] !== a.b.c) {
+  if ($[2] !== cond || $[3] !== a) {
     x = makeArray();
     if (cond) {
       x.push(identity(a.b.c));
     }
     $[2] = cond;
-    $[3] = a.b.c;
+    $[3] = a;
     $[4] = x;
   } else {
     x = $[4];

diff --git a/...cope-deps-hir-fork/reduce-reactive-deps/infer-function-uncond-access-hoists-other-dep.tsx b/...cope-deps-hir-fork/reduce-reactive-deps/infer-function-uncond-access-hoists-other-dep.tsx
@@ -1,6 +1,6 @@
 // @enablePropagateDepsInHIR
 
-import { identity, makeArray, Stringify, useIdentity } from "shared-runtime";
+import {identity, makeArray, Stringify, useIdentity} from 'shared-runtime';
 
 function Foo({a, cond}) {
   // Assume fn will be uncond evaluated, so we can safely evaluate {a.<any>,
@@ -17,5 +17,9 @@ function Foo({a, cond}) {
 export const FIXTURE_ENTRYPOINT = {
   fn: Foo,
   params: [{a: null, cond: true}],
-  sequentialRenders: [{a: null, cond: true}, {a: {b: {c: 4}}, cond: true},  {a: {b: {c: 4}}, cond: true}],
+  sequentialRenders: [
+    {a: null, cond: true},
+    {a: {b: {c: 4}}, cond: true},
+    {a: {b: {c: 4}}, cond: true},
+  ],
 };
diff --git a/.../reduce-reactive-deps/infer-function-uncond-optional-hoists-other-dep.expect.md b/.../reduce-reactive-deps/infer-function-uncond-optional-hoists-other-dep.expect.md
@@ -4,7 +4,7 @@
 ```javascript
 // @enablePropagateDepsInHIR
 
-import { identity, makeArray, Stringify, useIdentity } from "shared-runtime";
+import {identity, makeArray, Stringify, useIdentity} from 'shared-runtime';
 
 function Foo({a, cond}) {
   // Assume fn can be uncond evaluated, so we can safely evaluate a.b?.c.<any>
@@ -20,7 +20,11 @@ function Foo({a, cond}) {
 export const FIXTURE_ENTRYPOINT = {
   fn: Foo,
   params: [{a: null, cond: true}],
-  sequentialRenders: [{a: null, cond: true}, {a: {b: {c: {d: 5}}}, cond: true},  {a: {b: null}, cond: false}],
+  sequentialRenders: [
+    {a: null, cond: true},
+    {a: {b: {c: {d: 5}}}, cond: true},
+    {a: {b: null}, cond: false},
+  ],
 };
 
 ```

diff --git a/...pe-deps-hir-fork/reduce-reactive-deps/infer-function-uncond-optional-hoists-other-dep.tsx b/...pe-deps-hir-fork/reduce-reactive-deps/infer-function-uncond-optional-hoists-other-dep.tsx
@@ -1,6 +1,6 @@
 // @enablePropagateDepsInHIR
 
-import { identity, makeArray, Stringify, useIdentity } from "shared-runtime";
+import {identity, makeArray, Stringify, useIdentity} from 'shared-runtime';
 
 function Foo({a, cond}) {
   // Assume fn can be uncond evaluated, so we can safely evaluate a.b?.c.<any>
@@ -16,5 +16,9 @@ function Foo({a, cond}) {
 export const FIXTURE_ENTRYPOINT = {
   fn: Foo,
   params: [{a: null, cond: true}],
-  sequentialRenders: [{a: null, cond: true}, {a: {b: {c: {d: 5}}}, cond: true},  {a: {b: null}, cond: false}],
+  sequentialRenders: [
+    {a: null, cond: true},
+    {a: {b: {c: {d: 5}}}, cond: true},
+    {a: {b: null}, cond: false},
+  ],
 };
diff --git a/...ork/reduce-reactive-deps/todo-infer-function-uncond-optionals-hoisted.expect.md b/...ork/reduce-reactive-deps/todo-infer-function-uncond-optionals-hoisted.expect.md
@@ -4,7 +4,7 @@
 ```javascript
 // @enablePropagateDepsInHIR
 
-import { Stringify } from "shared-runtime";
+import {Stringify} from 'shared-runtime';
 
 function useFoo(a) {
   return <Stringify fn={() => a.b?.c.d?.e} shouldInvokeFns={true} />;
@@ -13,7 +13,13 @@ function useFoo(a) {
 export const FIXTURE_ENTRYPOINT = {
   fn: useFoo,
   params: [{a: null}],
-  sequentialRenders: [{a: null}, {a: {b: null}}, {a: {b: {c: {d: null}}}}, , {a: {b: {c: {d: {e: 4}}}}}],
+  sequentialRenders: [
+    {a: null},
+    {a: {b: null}},
+    {a: {b: {c: {d: null}}}},
+    ,
+    {a: {b: {c: {d: {e: 4}}}}},
+  ],
 };
 
 ```
@@ -45,6 +51,7 @@ export const FIXTURE_ENTRYPOINT = {
     { a: null },
     { a: { b: null } },
     { a: { b: { c: { d: null } } } },
+
     ,
     { a: { b: { c: { d: { e: 4 } } } } },
   ],

diff --git a/...scope-deps-hir-fork/reduce-reactive-deps/todo-infer-function-uncond-optionals-hoisted.tsx b/...scope-deps-hir-fork/reduce-reactive-deps/todo-infer-function-uncond-optionals-hoisted.tsx
@@ -1,6 +1,6 @@
 // @enablePropagateDepsInHIR
 
-import { Stringify } from "shared-runtime";
+import {Stringify} from 'shared-runtime';
 
 function useFoo(a) {
   return <Stringify fn={() => a.b?.c.d?.e} shouldInvokeFns={true} />;
@@ -9,5 +9,11 @@ function useFoo(a) {
 export const FIXTURE_ENTRYPOINT = {
   fn: useFoo,
   params: [{a: null}],
-  sequentialRenders: [{a: null}, {a: {b: null}}, {a: {b: {c: {d: null}}}}, , {a: {b: {c: {d: {e: 4}}}}}],
+  sequentialRenders: [
+    {a: null},
+    {a: {b: null}},
+    {a: {b: {c: {d: null}}}},
+    ,
+    {a: {b: {c: {d: {e: 4}}}}},
+  ],
 };