{"patch":"diff --git a\/compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts b\/compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts\nindex fd32580943..21249d3b0a 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts\n@@ -5,15 +5,21 @@\n * LICENSE file in the root directory of this source tree.\n *\/\n \n+import invariant from \"invariant\";\n import {\n+ Identifier,\n+ IdentifierId,\n+ InstructionId,\n ReactiveFunction,\n ReactiveInstruction,\n ReactiveScopeBlock,\n+ ReactiveValue,\n } from \"..\/HIR\/HIR\";\n import { ReactiveFunctionVisitor, visitReactiveFunction } from \".\/visitors\";\n \n type VisitorState = {\n nextId: number;\n+ tags: JsxExpressionTags;\n };\n class Visitor extends ReactiveFunctionVisitor {\n override visitScope(block: ReactiveScopeBlock, state: VisitorState): void {\n@@ -21,7 +27,7 @@ class Visitor extends ReactiveFunctionVisitor {\n for (const dep of block.scope.dependencies) {\n const { identifier } = dep;\n if (identifier.name == null) {\n- identifier.name = `t${state.nextId++}`;\n+ promoteTemporary(identifier, state);\n }\n }\n \/\/ This is technically optional. We could prune ReactiveScopes\n@@ -31,7 +37,7 @@ class Visitor extends ReactiveFunctionVisitor {\n \/\/ it is better for now to promote (and memoize) every output.\n for (const [, declaration] of block.scope.declarations) {\n if (declaration.identifier.name == null) {\n- declaration.identifier.name = `t${state.nextId++}`;\n+ promoteTemporary(declaration.identifier, state);\n }\n }\n }\n@@ -42,9 +48,38 @@ class Visitor extends ReactiveFunctionVisitor {\n this.traverseInstruction(instruction, state);\n }\n }\n+\n+type JsxExpressionTags = Set;\n+class CollectJsxTagsVisitor extends ReactiveFunctionVisitor {\n+ override visitValue(\n+ _id: InstructionId,\n+ value: ReactiveValue,\n+ state: JsxExpressionTags\n+ ): void {\n+ if (value.kind === \"JsxExpression\") {\n+ state.add(value.tag.identifier.id);\n+ }\n+ }\n+}\n+\n export function promoteUsedTemporaries(fn: ReactiveFunction): void {\n+ const tags: JsxExpressionTags = new Set();\n+ visitReactiveFunction(fn, new CollectJsxTagsVisitor(), tags);\n const state: VisitorState = {\n nextId: 0,\n+ tags,\n };\n visitReactiveFunction(fn, new Visitor(), state);\n }\n+\n+function promoteTemporary(identifier: Identifier, state: VisitorState): void {\n+ invariant(\n+ identifier.name === null,\n+ \"Expected to be called only for temporaries\"\n+ );\n+ if (state.tags.has(identifier.id)) {\n+ identifier.name = `T${state.nextId++}`;\n+ } else {\n+ identifier.name = `t${state.nextId++}`;\n+ }\n+}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.builtin-jsx-tag-lowered-between-mutations.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.builtin-jsx-tag-lowered-between-mutations.expect.md\nnew file mode 100644\nindex 0000000000..aecd9f6404\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.builtin-jsx-tag-lowered-between-mutations.expect.md\n@@ -0,0 +1,41 @@\n+\n+## Input\n+\n+```javascript\n+function Component(props) {\n+ const maybeMutable = new MaybeMutable();\n+ return

{maybeMutate(maybeMutable)}<\/div>;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+import { unstable_useMemoCache as useMemoCache } from \"react\";\n+function Component(props) {\n+ const $ = useMemoCache(3);\n+ let T0;\n+ let t1;\n+ if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ const maybeMutable = new MaybeMutable();\n+ T0 = \"div\";\n+ t1 = maybeMutate(maybeMutable);\n+ $[0] = T0;\n+ $[1] = t1;\n+ } else {\n+ T0 = $[0];\n+ t1 = $[1];\n+ }\n+ let t2;\n+ if ($[2] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ t2 = {t1}<\/T0>;\n+ $[2] = t2;\n+ } else {\n+ t2 = $[2];\n+ }\n+ return t2;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.builtin-jsx-tag-lowered-between-mutations.js b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.builtin-jsx-tag-lowered-between-mutations.js\nnew file mode 100644\nindex 0000000000..8b3fd76ca6\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.builtin-jsx-tag-lowered-between-mutations.js\n@@ -0,0 +1,4 @@\n+function Component(props) {\n+ const maybeMutable = new MaybeMutable();\n+ return

{maybeMutate(maybeMutable)}<\/div>;\n+}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.global-jsx-tag-lowered-between-mutations.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/global-jsx-tag-lowered-between-mutations.expect.md\nsimilarity index 93%\nrename from compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.global-jsx-tag-lowered-between-mutations.expect.md\nrename to compiler\/forget\/src\/__tests__\/fixtures\/compiler\/global-jsx-tag-lowered-between-mutations.expect.md\nindex e53baf4519..9cc16ee277 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.global-jsx-tag-lowered-between-mutations.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/global-jsx-tag-lowered-between-mutations.expect.md\n@@ -26,22 +26,22 @@ function Component(props) {\n import { unstable_useMemoCache as useMemoCache } from \"react\";\n function Component(props) {\n const $ = useMemoCache(3);\n- let t0;\n+ let T0;\n let t1;\n if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n const maybeMutable = new MaybeMutable();\n \n- t0 = View;\n+ T0 = View;\n t1 = maybeMutate(maybeMutable);\n- $[0] = t0;\n+ $[0] = T0;\n $[1] = t1;\n } else {\n- t0 = $[0];\n+ T0 = $[0];\n t1 = $[1];\n }\n let t2;\n if ($[2] === Symbol.for(\"react.memo_cache_sentinel\")) {\n- t2 = {t1}<\/t0>;\n+ t2 = {t1}<\/T0>;\n $[2] = t2;\n } else {\n t2 = $[2];\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.global-jsx-tag-lowered-between-mutations.js b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/global-jsx-tag-lowered-between-mutations.js\nsimilarity index 100%\nrename from compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.global-jsx-tag-lowered-between-mutations.js\nrename to compiler\/forget\/src\/__tests__\/fixtures\/compiler\/global-jsx-tag-lowered-between-mutations.js\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-dynamic.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-dynamic.expect.md\nindex 253483f765..1c3c2a0a8b 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-dynamic.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-dynamic.expect.md\n@@ -28,20 +28,20 @@ function Component(props) {\n const item = useFragment(FRAGMENT, props.item);\n useFreeze(item);\n const c_0 = $[0] !== item;\n- let t1;\n+ let T1;\n let t2;\n- let t3;\n+ let T3;\n let t4;\n let t0;\n let t5;\n- let t6;\n+ let T6;\n let t7;\n if (c_0) {\n const count = new MaybeMutable(item);\n \n- t6 = View;\n+ T6 = View;\n t7 = \"\\n \";\n- t3 = View;\n+ T3 = View;\n t4 = \"\\n \";\n if ($[9] === Symbol.for(\"react.memo_cache_sentinel\")) {\n t0 = Text<\/span>;\n@@ -50,39 +50,39 @@ function Component(props) {\n t0 = $[9];\n }\n t5 = \"\\n \";\n- t1 = \"span\";\n+ T1 = \"span\";\n t2 = maybeMutate(count);\n $[0] = item;\n- $[1] = t1;\n+ $[1] = T1;\n $[2] = t2;\n- $[3] = t3;\n+ $[3] = T3;\n $[4] = t4;\n $[5] = t0;\n $[6] = t5;\n- $[7] = t6;\n+ $[7] = T6;\n $[8] = t7;\n } else {\n- t1 = $[1];\n+ T1 = $[1];\n t2 = $[2];\n- t3 = $[3];\n+ T3 = $[3];\n t4 = $[4];\n t0 = $[5];\n t5 = $[6];\n- t6 = $[7];\n+ T6 = $[7];\n t7 = $[8];\n }\n- const c_10 = $[10] !== t1;\n+ const c_10 = $[10] !== T1;\n const c_11 = $[11] !== t2;\n let t8;\n if (c_10 || c_11) {\n- t8 = {t2}<\/t1>;\n- $[10] = t1;\n+ t8 = {t2}<\/T1>;\n+ $[10] = T1;\n $[11] = t2;\n $[12] = t8;\n } else {\n t8 = $[12];\n }\n- const c_13 = $[13] !== t3;\n+ const c_13 = $[13] !== T3;\n const c_14 = $[14] !== t4;\n const c_15 = $[15] !== t0;\n const c_16 = $[16] !== t5;\n@@ -90,14 +90,14 @@ function Component(props) {\n let t9;\n if (c_13 || c_14 || c_15 || c_16 || c_17) {\n t9 = (\n- \n+ \n {t4}\n {t0}\n {t5}\n {t8}\n- <\/t3>\n+ <\/T3>\n );\n- $[13] = t3;\n+ $[13] = T3;\n $[14] = t4;\n $[15] = t0;\n $[16] = t5;\n@@ -106,18 +106,18 @@ function Component(props) {\n } else {\n t9 = $[18];\n }\n- const c_19 = $[19] !== t6;\n+ const c_19 = $[19] !== T6;\n const c_20 = $[20] !== t7;\n const c_21 = $[21] !== t9;\n let t10;\n if (c_19 || c_20 || c_21) {\n t10 = (\n- \n+ \n {t7}\n {t9}\n- <\/t6>\n+ <\/T6>\n );\n- $[19] = t6;\n+ $[19] = T6;\n $[20] = t7;\n $[21] = t9;\n $[22] = t10;\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-static.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-static.expect.md\nindex 3981985063..cb89a15a15 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-static.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-static.expect.md\n@@ -22,20 +22,20 @@ function Component(props) {\n import { unstable_useMemoCache as useMemoCache } from \"react\";\n function Component(props) {\n const $ = useMemoCache(12);\n- let t1;\n+ let T1;\n let t2;\n- let t3;\n+ let T3;\n let t4;\n let t0;\n let t5;\n- let t6;\n+ let T6;\n let t7;\n if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n const count = new MaybeMutable();\n \n- t6 = View;\n+ T6 = View;\n t7 = \"\\n \";\n- t3 = View;\n+ T3 = View;\n t4 = \"\\n \";\n if ($[8] === Symbol.for(\"react.memo_cache_sentinel\")) {\n t0 = Text<\/span>;\n@@ -44,29 +44,29 @@ function Component(props) {\n t0 = $[8];\n }\n t5 = \"\\n \";\n- t1 = \"span\";\n+ T1 = \"span\";\n t2 = maybeMutate(count);\n- $[0] = t1;\n+ $[0] = T1;\n $[1] = t2;\n- $[2] = t3;\n+ $[2] = T3;\n $[3] = t4;\n $[4] = t0;\n $[5] = t5;\n- $[6] = t6;\n+ $[6] = T6;\n $[7] = t7;\n } else {\n- t1 = $[0];\n+ T1 = $[0];\n t2 = $[1];\n- t3 = $[2];\n+ T3 = $[2];\n t4 = $[3];\n t0 = $[4];\n t5 = $[5];\n- t6 = $[6];\n+ T6 = $[6];\n t7 = $[7];\n }\n let t8;\n if ($[9] === Symbol.for(\"react.memo_cache_sentinel\")) {\n- t8 = {t2}<\/t1>;\n+ t8 = {t2}<\/T1>;\n $[9] = t8;\n } else {\n t8 = $[9];\n@@ -74,12 +74,12 @@ function Component(props) {\n let t9;\n if ($[10] === Symbol.for(\"react.memo_cache_sentinel\")) {\n t9 = (\n- \n+ \n {t4}\n {t0}\n {t5}\n {t8}\n- <\/t3>\n+ <\/T3>\n );\n $[10] = t9;\n } else {\n@@ -88,10 +88,10 @@ function Component(props) {\n let t10;\n if ($[11] === Symbol.for(\"react.memo_cache_sentinel\")) {\n t10 = (\n- \n+ \n {t7}\n {t9}\n- <\/t6>\n+ <\/T6>\n );\n $[11] = t10;\n } else {\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/jsx-tag-evaluation-order-non-global.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/jsx-tag-evaluation-order-non-global.expect.md\nindex 49d7467cfb..4915da4d97 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/jsx-tag-evaluation-order-non-global.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/jsx-tag-evaluation-order-non-global.expect.md\n@@ -27,26 +27,26 @@ function Component(props) {\n const c_0 = $[0] !== props.component;\n const c_1 = $[1] !== props.alternateComponent;\n let Tag;\n- let t0;\n+ let T0;\n let t1;\n let t2;\n if (c_0 || c_1) {\n const maybeMutable = new MaybeMutable();\n Tag = props.component;\n \n- t0 = Tag;\n+ T0 = Tag;\n t1 = \"\\n \";\n Tag = props.alternateComponent;\n t2 = maybeMutate(maybeMutable);\n $[0] = props.component;\n $[1] = props.alternateComponent;\n $[2] = Tag;\n- $[3] = t0;\n+ $[3] = T0;\n $[4] = t1;\n $[5] = t2;\n } else {\n Tag = $[2];\n- t0 = $[3];\n+ T0 = $[3];\n t1 = $[4];\n t2 = $[5];\n }\n@@ -59,20 +59,20 @@ function Component(props) {\n } else {\n t3 = $[7];\n }\n- const c_8 = $[8] !== t0;\n+ const c_8 = $[8] !== T0;\n const c_9 = $[9] !== t1;\n const c_10 = $[10] !== t2;\n const c_11 = $[11] !== t3;\n let t4;\n if (c_8 || c_9 || c_10 || c_11) {\n t4 = (\n- \n+ \n {t1}\n {t2}\n {t3}\n- <\/t0>\n+ <\/T0>\n );\n- $[8] = t0;\n+ $[8] = T0;\n $[9] = t1;\n $[10] = t2;\n $[11] = t3;\n","body":"Ensures that temporaries used in JsxExpression tags are named with a capital \nletter so that they are treated as custom components rather than builtins.","commit":{"authorName":"Joe Savona","authoredAt":"2023-04-26T11:27:34-07:00","subject":"Promote temporaries used in JSX to uppercase names","shortRevision":"9aea37ff5a","authorEmail":"joesavona@fb.com","revision":"9aea37ff5af310dbd28a22b0d56e3d4233e8cb24"},"parents":["5f2f76cbcd27eb1bd2d0cb68965046183f71d98b"],"files":[{"path":"compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.builtin-jsx-tag-lowered-between-mutations.expect.md","status":"A"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.builtin-jsx-tag-lowered-between-mutations.js","status":"A"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/global-jsx-tag-lowered-between-mutations.expect.md","status":"R093","previousPath":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.global-jsx-tag-lowered-between-mutations.expect.md"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/global-jsx-tag-lowered-between-mutations.js","status":"R100","previousPath":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/_bug.global-jsx-tag-lowered-between-mutations.js"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-dynamic.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/inner-memo-value-not-promoted-to-outer-scope-static.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/jsx-tag-evaluation-order-non-global.expect.md","status":"M"}]}

dillon1000/react

Files changed