{"body":"","parents":["ce7cab4eeeae907d9cac4af10792272a63b01336"],"files":[{"path":"compiler\/forget\/src\/HIR\/BuildHIR.ts","status":"M"},{"path":"compiler\/forget\/src\/HIR\/HIR.ts","status":"M"},{"path":"compiler\/forget\/src\/HIR\/PrintHIR.ts","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-1.expect.md","status":"A"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-1.js","status":"A"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-within-block.expect.md","status":"A"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-within-block.js","status":"A"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-block.expect.md","status":"A"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-block.js","status":"A"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-function.expect.md","status":"A"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-function.js","status":"A"}],"patch":"diff --git a\/compiler\/forget\/src\/HIR\/BuildHIR.ts b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\nindex 1386175177..ac1b308f02 100644\n--- a\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n@@ -5,7 +5,7 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n-import { NodePath } from \"@babel\/traverse\";\n+import { NodePath, Scope } from \"@babel\/traverse\";\n import * as t from \"@babel\/types\";\n import { invariant } from \"..\/Utils\/CompilerError\";\n import todo, { todoInvariant } from \"..\/Utils\/todo\";\n@@ -1151,6 +1151,8 @@ function lowerExpression(\n case \"FunctionExpression\": {\n const expr = exprPath as NodePath;\n const name: string | null = expr.get(\"id\")?.node?.name ?? null;\n+ const componentScope: Scope = expr.scope.parent.getFunctionParent()!;\n+ const dependencies = gatherCapturedDeps(expr, componentScope);\n const body = expr.get(\"body\").node;\n const params: Array = expr.get(\"params\").map((p) => {\n todoInvariant(p.isIdentifier(), \"handle non identifier params\");\n@@ -1161,6 +1163,7 @@ function lowerExpression(\n name,\n body,\n params,\n+ dependencies,\n loc: exprLoc,\n };\n }\n@@ -1540,3 +1543,53 @@ function lowerAssignment(\n }\n }\n }\n+\n+function capturePureScopes(\n+ currentScope: Scope,\n+ componentScope: Scope\n+): Set {\n+ let pureScopes: Set = new Set();\n+ while (currentScope) {\n+ pureScopes.add(currentScope);\n+\n+ if (currentScope === componentScope) {\n+ break;\n+ }\n+\n+ currentScope = currentScope.parent;\n+ }\n+ return pureScopes;\n+}\n+\n+function gatherCapturedDeps(\n+ fn: NodePath,\n+ componentScope: Scope\n+): Set {\n+ const captured: Set = new Set();\n+\n+ \/\/ Capture all the scopes from the parent of this function up to and including\n+ \/\/ the component scope.\n+ const pureScopes: Set = capturePureScopes(\n+ fn.scope.parent,\n+ componentScope\n+ );\n+\n+ fn.get(\"body\").traverse({\n+ Expression(path) {\n+ \/\/ TODO(gsn): Handle member expressions\n+ if (!path.isIdentifier) {\n+ return;\n+ }\n+\n+ const id = path as NodePath;\n+ const binding = id.scope.getBinding(id.node.name);\n+ if (binding === undefined || !pureScopes.has(binding.scope)) {\n+ return;\n+ }\n+\n+ captured.add(binding.identifier);\n+ },\n+ });\n+\n+ return captured;\n+}\ndiff --git a\/compiler\/forget\/src\/HIR\/HIR.ts b\/compiler\/forget\/src\/HIR\/HIR.ts\nindex 8043f44d99..bc2d4682f7 100644\n--- a\/compiler\/forget\/src\/HIR\/HIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/HIR.ts\n@@ -313,6 +313,7 @@ export type InstructionData =\n kind: \"FunctionExpression\";\n name: string | null;\n params: Array;\n+ dependencies: Set;\n body: t.BlockStatement;\n }\n \ndiff --git a\/compiler\/forget\/src\/HIR\/PrintHIR.ts b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\nindex 67392651a3..19e5ac833e 100644\n--- a\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n@@ -293,7 +293,10 @@ export function printInstructionValue(instrValue: InstructionValue): string {\n case \"FunctionExpression\": {\n const params = instrValue.params.join(\",\");\n const body = generate(instrValue.body).code;\n- value = `Function ${instrValue.name}(${params}){${body}}`;\n+ const deps = [...instrValue.dependencies].map((i) => i.name).join(\",\");\n+ value = `Function ${instrValue.name ?? \"\"} @deps[${deps}] (${\n+ params ?? \"\"\n+ }){${body}}`;\n break;\n }\n default: {\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-1.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-1.expect.md\nnew file mode 100644\nindex 0000000000..de7dd20aec\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-1.expect.md\n@@ -0,0 +1,36 @@\n+\n+## Input\n+\n+```javascript\n+function component() {\n+ let z = 100;\n+ let x = function () {\n+ z;\n+ };\n+ return x;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+function component() {\n+ const $ = React.useMemoCache();\n+ const z = 100;\n+ let x;\n+ if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ x = function () {\n+ z;\n+ };\n+\n+ $[0] = x;\n+ } else {\n+ x = $[0];\n+ }\n+\n+ return x;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-1.js b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-1.js\nnew file mode 100644\nindex 0000000000..e3fc3c5452\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-1.js\n@@ -0,0 +1,7 @@\n+function component() {\n+ let z = 100;\n+ let x = function () {\n+ z;\n+ };\n+ return x;\n+}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-within-block.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-within-block.expect.md\nnew file mode 100644\nindex 0000000000..6f8bbc044d\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-within-block.expect.md\n@@ -0,0 +1,40 @@\n+\n+## Input\n+\n+```javascript\n+function component() {\n+ let z = 100;\n+ let x;\n+ {\n+ x = function () {\n+ z;\n+ };\n+ }\n+ return x;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+function component() {\n+ const $ = React.useMemoCache();\n+ const z = 100;\n+ const x = undefined;\n+ let x$0;\n+ if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ x$0 = function () {\n+ z;\n+ };\n+\n+ $[0] = x$0;\n+ } else {\n+ x$0 = $[0];\n+ }\n+\n+ return x$0;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-within-block.js b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-within-block.js\nnew file mode 100644\nindex 0000000000..5154c4c8fb\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-within-block.js\n@@ -0,0 +1,10 @@\n+function component() {\n+ let z = 100;\n+ let x;\n+ {\n+ x = function () {\n+ z;\n+ };\n+ }\n+ return x;\n+}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-block.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-block.expect.md\nnew file mode 100644\nindex 0000000000..a9aaf58a15\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-block.expect.md\n@@ -0,0 +1,40 @@\n+\n+## Input\n+\n+```javascript\n+function component() {\n+ let z = 100;\n+ let x = function () {\n+ {\n+ z;\n+ }\n+ };\n+ return x;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+function component() {\n+ const $ = React.useMemoCache();\n+ const z = 100;\n+ let x;\n+ if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ x = function () {\n+ {\n+ z;\n+ }\n+ };\n+\n+ $[0] = x;\n+ } else {\n+ x = $[0];\n+ }\n+\n+ return x;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-block.js b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-block.js\nnew file mode 100644\nindex 0000000000..26fd218e71\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-block.js\n@@ -0,0 +1,9 @@\n+function component() {\n+ let z = 100;\n+ let x = function () {\n+ {\n+ z;\n+ }\n+ };\n+ return x;\n+}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-function.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-function.expect.md\nnew file mode 100644\nindex 0000000000..5d90511ee5\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-function.expect.md\n@@ -0,0 +1,40 @@\n+\n+## Input\n+\n+```javascript\n+function component() {\n+ let z = 100;\n+ let x = function () {\n+ (function () {\n+ z;\n+ })();\n+ };\n+ return x;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+function component() {\n+ const $ = React.useMemoCache();\n+ const z = 100;\n+ let x;\n+ if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ x = function () {\n+ (function () {\n+ z;\n+ })();\n+ };\n+\n+ $[0] = x;\n+ } else {\n+ x = $[0];\n+ }\n+\n+ return x;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-function.js b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-function.js\nnew file mode 100644\nindex 0000000000..46eda93731\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-variable-in-nested-function.js\n@@ -0,0 +1,9 @@\n+function component() {\n+ let z = 100;\n+ let x = function () {\n+ (function () {\n+ z;\n+ })();\n+ };\n+ return x;\n+}\n","commit":{"subject":"[hir] Gather dependencies for lambdas","authoredAt":"2023-01-09T18:22:35+00:00","revision":"346ecb27fe1b5dc31912d0120929250affbdd24e","authorEmail":"gsathya.ceg@gmail.com","authorName":"Sathya Gunasekaran","shortRevision":"346ecb27fe"}}

dillon1000/react

Files changed