{"body":"This PR adds a Hole kind that can be present in both ArrayExpression and \nArrayPatterns. \n\nThis Hole type is not interesting for our inference passes and is skipped over \nfor all of the pipeline.","commit":{"revision":"25527b3c0a7e90f740ae09f439ba6a4ae7efc4b0","authorName":"Sathya Gunasekaran","authoredAt":"2023-07-26T12:03:19+01:00","authorEmail":"gsathya.ceg@gmail.com","subject":"[hir] Add support for holey arrays","shortRevision":"25527b3c0a"},"parents":["dcb6549ddae8c10a826503222d6bd7c2dfb770a4"],"files":[{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/BuildHIR.ts","status":"M"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/HIR.ts","status":"M"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/PrintHIR.ts","status":"M"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/visitors.ts","status":"M"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/Optimization\/DeadCodeElimination.ts","status":"M"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts","status":"M"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts","status":"M"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-expr.expect.md","status":"A"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-expr.js","status":"A"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce-2.expect.md","status":"A"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce-2.js","status":"A"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce.expect.md","status":"A"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce.js","status":"A"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array.expect.md","status":"A"},{"path":"compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array.js","status":"A"}],"patch":"diff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/BuildHIR.ts b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/BuildHIR.ts\nindex dfdd840a21..1295e640f1 100644\n--- a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/BuildHIR.ts\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/BuildHIR.ts\n@@ -17,6 +17,7 @@ import { Err, Ok, Result } from \"..\/Utils\/Result\";\n import { assertExhaustive } from \"..\/Utils\/utils\";\n import { Environment } from \".\/Environment\";\n import {\n+ ArrayExpression,\n ArrayPattern,\n BlockId,\n BranchTerminal,\n@@ -1064,14 +1065,11 @@ function lowerExpression(\n }\n case \"ArrayExpression\": {\n const expr = exprPath as NodePath;\n- let elements: Array = [];\n+ let elements: ArrayExpression[\"elements\"] = [];\n for (const element of expr.get(\"elements\")) {\n if (element.node == null) {\n- builder.errors.push({\n- reason: `(BuildHIR::lowerExpression) Handle ${element.type} elements in ArrayExpression`,\n- severity: ErrorSeverity.Todo,\n- loc: null,\n- suggestions: null,\n+ elements.push({\n+ kind: \"Hole\",\n });\n continue;\n } else if (element.isExpression()) {\n@@ -2696,6 +2694,9 @@ function lowerAssignment(\n for (let i = 0; i < elements.length; i++) {\n const element = elements[i];\n if (element.node == null) {\n+ items.push({\n+ kind: \"Hole\",\n+ });\n continue;\n }\n if (element.isRestElement()) {\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/HIR.ts b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/HIR.ts\nindex 7f55f70b51..30290f231a 100644\n--- a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/HIR.ts\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/HIR.ts\n@@ -472,8 +472,18 @@ export type LValuePattern = {\n kind: InstructionKind;\n };\n \n+export type ArrayExpression = {\n+ kind: \"ArrayExpression\";\n+ elements: Array;\n+ loc: SourceLocation;\n+};\n+\n export type Pattern = ArrayPattern | ObjectPattern;\n \n+export type Hole = {\n+ kind: \"Hole\";\n+};\n+\n export type SpreadPattern = {\n kind: \"Spread\";\n place: Place;\n@@ -481,7 +491,7 @@ export type SpreadPattern = {\n \n export type ArrayPattern = {\n kind: \"ArrayPattern\";\n- items: Array;\n+ items: Array;\n };\n \n export type ObjectPattern = {\n@@ -648,11 +658,7 @@ export type InstructionValue =\n properties: Array;\n loc: SourceLocation;\n }\n- | {\n- kind: \"ArrayExpression\";\n- elements: Array;\n- loc: SourceLocation;\n- }\n+ | ArrayExpression\n | { kind: \"JsxFragment\"; children: Array; loc: SourceLocation }\n | {\n kind: \"RegExpLiteral\";\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/PrintHIR.ts b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/PrintHIR.ts\nindex 6a57bada74..05a87b1b10 100644\n--- a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/PrintHIR.ts\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/PrintHIR.ts\n@@ -239,6 +239,10 @@ export function printTerminal(terminal: Terminal): Array | string {\n return value;\n }\n \n+function printHole(): string {\n+ return \"\";\n+}\n+\n export function printInstructionValue(instrValue: ReactiveValue): string {\n let value = \"\";\n switch (instrValue.kind) {\n@@ -247,6 +251,8 @@ export function printInstructionValue(instrValue: ReactiveValue): string {\n .map((element) => {\n if (element.kind === \"Identifier\") {\n return printPlace(element);\n+ } else if (element.kind === \"Hole\") {\n+ return printHole();\n } else {\n return `...${printPlace(element.place)}`;\n }\n@@ -554,7 +560,16 @@ export function printPattern(pattern: Pattern | Place | SpreadPattern): string {\n switch (pattern.kind) {\n case \"ArrayPattern\": {\n return (\n- \"[ \" + pattern.items.map((item) => printPattern(item)).join(\", \") + \" ]\"\n+ \"[ \" +\n+ pattern.items\n+ .map((item) => {\n+ if (item.kind === \"Hole\") {\n+ return \"\";\n+ }\n+ return printPattern(item);\n+ })\n+ .join(\", \") +\n+ \" ]\"\n );\n }\n case \"ObjectPattern\": {\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/visitors.ts b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/visitors.ts\nindex 5b7862df43..321ca6799f 100644\n--- a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/visitors.ts\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/HIR\/visitors.ts\n@@ -158,7 +158,7 @@ export function* eachInstructionValueOperand(\n for (const element of instrValue.elements) {\n if (element.kind === \"Identifier\") {\n yield element;\n- } else {\n+ } else if (element.kind === \"Spread\") {\n yield element.place;\n }\n }\n@@ -253,6 +253,8 @@ export function* eachPatternOperand(pattern: Pattern): Iterable {\n yield item;\n } else if (item.kind === \"Spread\") {\n yield item.place;\n+ } else if (item.kind === \"Hole\") {\n+ continue;\n } else {\n assertExhaustive(\n item,\n@@ -424,9 +426,11 @@ export function mapInstructionOperands(\n instrValue.elements = instrValue.elements.map((element) => {\n if (element.kind === \"Identifier\") {\n return fn(element);\n- } else {\n+ } else if (element.kind === \"Spread\") {\n element.place = fn(element.place);\n return element;\n+ } else {\n+ return element;\n }\n });\n break;\n@@ -496,9 +500,11 @@ export function mapPatternOperands(\n pattern.items = pattern.items.map((item) => {\n if (item.kind === \"Identifier\") {\n return fn(item);\n- } else {\n+ } else if (item.kind === \"Spread\") {\n item.place = fn(item.place);\n return item;\n+ } else {\n+ return item;\n }\n });\n break;\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/Optimization\/DeadCodeElimination.ts b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/Optimization\/DeadCodeElimination.ts\nindex 0d098231ca..e08582d414 100644\n--- a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/Optimization\/DeadCodeElimination.ts\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/Optimization\/DeadCodeElimination.ts\n@@ -114,7 +114,7 @@ function visitInstruction(instr: Instruction, state: State): void {\n nextItems = originalItems.slice(0, i + 1);\n break;\n }\n- } else {\n+ } else if (item.kind === \"Spread\") {\n if (state.used(item.place.identifier)) {\n nextItems = originalItems.slice(0, i + 1);\n break;\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\nindex 0e309809cb..494ed24f0d 100644\n--- a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\n@@ -716,8 +716,10 @@ function codegenInstructionValue(\n const elements = instrValue.elements.map((element) => {\n if (element.kind === \"Identifier\") {\n return codegenPlace(cx, element);\n- } else {\n+ } else if (element.kind === \"Spread\") {\n return t.spreadElement(codegenPlace(cx, element.place));\n+ } else {\n+ return null;\n }\n });\n value = t.arrayExpression(elements);\n@@ -1245,7 +1247,14 @@ function codegenLValue(\n ): t.ArrayPattern | t.ObjectPattern | t.RestElement | t.Identifier {\n switch (pattern.kind) {\n case \"ArrayPattern\": {\n- return t.arrayPattern(pattern.items.map((item) => codegenLValue(item)));\n+ return t.arrayPattern(\n+ pattern.items.map((item) => {\n+ if (item.kind === \"Hole\") {\n+ return null;\n+ }\n+ return codegenLValue(item);\n+ })\n+ );\n }\n case \"ObjectPattern\": {\n return t.objectPattern(\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts\nindex 822c089fb8..c6dc25b89c 100644\n--- a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts\n@@ -628,7 +628,7 @@ function computePatternLValues(pattern: Pattern): Array {\n for (const item of pattern.items) {\n if (item.kind === \"Identifier\") {\n lvalues.push({ place: item, level: MemoizationLevel.Conditional });\n- } else {\n+ } else if (item.kind === \"Spread\") {\n lvalues.push({ place: item.place, level: MemoizationLevel.Memoized });\n }\n }\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-expr.expect.md b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-expr.expect.md\nnew file mode 100644\nindex 0000000000..9b03535e27\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-expr.expect.md\n@@ -0,0 +1,32 @@\n+\n+## Input\n+\n+```javascript\n+function t(props) {\n+ let x = [, foo, props];\n+ return x;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+import { unstable_useMemoCache as useMemoCache } from \"react\";\n+function t(props) {\n+ const $ = useMemoCache(2);\n+ const c_0 = $[0] !== props;\n+ let t0;\n+ if (c_0) {\n+ t0 = [, foo, props];\n+ $[0] = props;\n+ $[1] = t0;\n+ } else {\n+ t0 = $[1];\n+ }\n+ const x = t0;\n+ return x;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-expr.js b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-expr.js\nnew file mode 100644\nindex 0000000000..533b5553a1\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-expr.js\n@@ -0,0 +1,4 @@\n+function t(props) {\n+ let x = [, foo, props];\n+ return x;\n+}\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce-2.expect.md b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce-2.expect.md\nnew file mode 100644\nindex 0000000000..d8089b3cfa\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce-2.expect.md\n@@ -0,0 +1,21 @@\n+\n+## Input\n+\n+```javascript\n+function t(props) {\n+ let [foo, bar, ,] = props;\n+ return foo;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+function t(props) {\n+ const [foo] = props;\n+ return foo;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce-2.js b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce-2.js\nnew file mode 100644\nindex 0000000000..3009a00812\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce-2.js\n@@ -0,0 +1,4 @@\n+function t(props) {\n+ let [foo, bar, ,] = props;\n+ return foo;\n+}\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce.expect.md b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce.expect.md\nnew file mode 100644\nindex 0000000000..1778ec0203\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce.expect.md\n@@ -0,0 +1,21 @@\n+\n+## Input\n+\n+```javascript\n+function t(props) {\n+ let [, foo, bar] = props;\n+ return foo;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+function t(props) {\n+ const [, foo] = props;\n+ return foo;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce.js b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce.js\nnew file mode 100644\nindex 0000000000..2c070d4955\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array-pattern-dce.js\n@@ -0,0 +1,4 @@\n+function t(props) {\n+ let [, foo, bar] = props;\n+ return foo;\n+}\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array.expect.md b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array.expect.md\nnew file mode 100644\nindex 0000000000..5276adf724\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array.expect.md\n@@ -0,0 +1,23 @@\n+\n+## Input\n+\n+```javascript\n+function t(props) {\n+ let [, setstate] = useState();\n+ setstate(1);\n+ return props.foo;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+function t(props) {\n+ const [, setstate] = useState();\n+ setstate(1);\n+ return props.foo;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array.js b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array.js\nnew file mode 100644\nindex 0000000000..302672aa1c\n--- \/dev\/null\n+++ b\/compiler\/forget\/packages\/babel-plugin-react-forget\/src\/__tests__\/fixtures\/compiler\/holey-array.js\n@@ -0,0 +1,5 @@\n+function t(props) {\n+ let [, setstate] = useState();\n+ setstate(1);\n+ return props.foo;\n+}\n"}

dillon1000/react

Files changed