{"patch":"diff --git a\/compiler\/forget\/src\/HIR\/BuildHIR.ts b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\nindex b87f4b1846..bd3393d114 100644\n--- a\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n@@ -916,17 +916,25 @@ function lowerExpression(\n }\n if (calleePath.isMemberExpression()) {\n const { object, property } = lowerMemberExpression(builder, calleePath);\n- let args: Place[] = [];\n+ let args: Array = [];\n for (const argPath of expr.get(\"arguments\")) {\n- if (!argPath.isExpression()) {\n+ if (argPath.isSpreadElement()) {\n+ args.push({\n+ kind: \"Spread\",\n+ place: lowerExpressionToTemporary(\n+ builder,\n+ argPath.get(\"argument\")\n+ ),\n+ });\n+ } else if (argPath.isExpression()) {\n+ args.push(lowerExpressionToTemporary(builder, argPath));\n+ } else {\n builder.errors.push({\n reason: `(BuildHIR::lowerExpression) Handle ${argPath.type} arguments in CallExpression`,\n severity: ErrorSeverity.Todo,\n nodePath: argPath,\n });\n- continue;\n }\n- args.push(lowerExpressionToTemporary(builder, argPath));\n }\n if (typeof property === \"string\") {\n return {\n@@ -947,9 +955,19 @@ function lowerExpression(\n }\n } else {\n const callee = lowerExpressionToTemporary(builder, calleePath);\n- let args: Place[] = [];\n+ let args: Array = [];\n for (const argPath of expr.get(\"arguments\")) {\n- if (!argPath.isExpression()) {\n+ if (argPath.isSpreadElement()) {\n+ args.push({\n+ kind: \"Spread\",\n+ place: lowerExpressionToTemporary(\n+ builder,\n+ argPath.get(\"argument\")\n+ ),\n+ });\n+ } else if (argPath.isExpression()) {\n+ args.push(lowerExpressionToTemporary(builder, argPath));\n+ } else {\n builder.errors.push({\n reason: `(BuildHIR::lowerExpression) Handle ${argPath.type} arguments in CallExpression`,\n severity: ErrorSeverity.Todo,\n@@ -957,7 +975,6 @@ function lowerExpression(\n });\n continue;\n }\n- args.push(lowerExpressionToTemporary(builder, argPath));\n }\n return {\n kind: \"CallExpression\",\ndiff --git a\/compiler\/forget\/src\/HIR\/HIR.ts b\/compiler\/forget\/src\/HIR\/HIR.ts\nindex 8ed931c45b..cab054dfa3 100644\n--- a\/compiler\/forget\/src\/HIR\/HIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/HIR.ts\n@@ -480,21 +480,21 @@ export type InstructionValue =\n | {\n kind: \"CallExpression\";\n callee: Place;\n- args: Array;\n+ args: Array;\n loc: SourceLocation;\n }\n | {\n kind: \"PropertyCall\";\n receiver: Place;\n property: string;\n- args: Array;\n+ args: Array;\n loc: SourceLocation;\n }\n | {\n kind: \"ComputedCall\";\n receiver: Place;\n property: Place;\n- args: Array;\n+ args: Array;\n loc: SourceLocation;\n }\n | {\ndiff --git a\/compiler\/forget\/src\/HIR\/PrintHIR.ts b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\nindex ab3afe2d26..f04c79fc9c 100644\n--- a\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n@@ -258,20 +258,20 @@ export function printInstructionValue(instrValue: ReactiveValue): string {\n }\n case \"CallExpression\": {\n value = `Call ${printPlace(instrValue.callee)}(${instrValue.args\n- .map((arg) => printPlace(arg))\n+ .map((arg) => printPattern(arg))\n .join(\", \")})`;\n break;\n }\n case \"PropertyCall\": {\n value = `PropertyCall ${printPlace(instrValue.receiver)}.${\n instrValue.property\n- }(${instrValue.args.map((arg) => printPlace(arg)).join(\", \")})`;\n+ }(${instrValue.args.map((arg) => printPattern(arg)).join(\", \")})`;\n break;\n }\n case \"ComputedCall\": {\n value = `ComputedCall ${printPlace(instrValue.receiver)}[${printPlace(\n instrValue.property\n- )}](${instrValue.args.map((arg) => printPlace(arg)).join(\", \")})`;\n+ )}](${instrValue.args.map((arg) => printPattern(arg)).join(\", \")})`;\n break;\n }\n case \"JSXText\":\ndiff --git a\/compiler\/forget\/src\/HIR\/visitors.ts b\/compiler\/forget\/src\/HIR\/visitors.ts\nindex 58397223fe..fa394931ef 100644\n--- a\/compiler\/forget\/src\/HIR\/visitors.ts\n+++ b\/compiler\/forget\/src\/HIR\/visitors.ts\n@@ -14,6 +14,7 @@ import {\n Pattern,\n Place,\n ReactiveInstruction,\n+ SpreadPattern,\n Terminal,\n } from \".\/HIR\";\n \n@@ -45,7 +46,7 @@ export function* eachInstructionValueOperand(\n case \"NewExpression\":\n case \"CallExpression\": {\n yield instrValue.callee;\n- yield* instrValue.args;\n+ yield* eachCallArgument(instrValue.args);\n break;\n }\n case \"BinaryExpression\": {\n@@ -55,13 +56,13 @@ export function* eachInstructionValueOperand(\n }\n case \"PropertyCall\": {\n yield instrValue.receiver;\n- yield* instrValue.args;\n+ yield* eachCallArgument(instrValue.args);\n break;\n }\n case \"ComputedCall\": {\n yield instrValue.receiver;\n yield instrValue.property;\n- yield* instrValue.args;\n+ yield* eachCallArgument(instrValue.args);\n break;\n }\n case \"LoadLocal\": {\n@@ -185,6 +186,18 @@ export function* eachInstructionValueOperand(\n }\n }\n \n+export function* eachCallArgument(\n+ args: Array\n+): Iterable {\n+ for (const arg of args) {\n+ if (arg.kind === \"Identifier\") {\n+ yield arg;\n+ } else {\n+ yield arg.place;\n+ }\n+ }\n+}\n+\n export function doesPatternContainSpreadElement(pattern: Pattern): boolean {\n switch (pattern.kind) {\n case \"ArrayPattern\": {\n@@ -331,18 +344,18 @@ export function mapInstructionOperands(\n case \"NewExpression\":\n case \"CallExpression\": {\n instrValue.callee = fn(instrValue.callee);\n- instrValue.args = instrValue.args.map((arg) => fn(arg));\n+ instrValue.args = mapCallArguments(instrValue.args, fn);\n break;\n }\n case \"PropertyCall\": {\n instrValue.receiver = fn(instrValue.receiver);\n- instrValue.args = instrValue.args.map((arg) => fn(arg));\n+ instrValue.args = mapCallArguments(instrValue.args, fn);\n break;\n }\n case \"ComputedCall\": {\n instrValue.receiver = fn(instrValue.receiver);\n instrValue.property = fn(instrValue.property);\n- instrValue.args = instrValue.args.map((arg) => fn(arg));\n+ instrValue.args = mapCallArguments(instrValue.args, fn);\n break;\n }\n case \"UnaryExpression\": {\n@@ -423,6 +436,20 @@ export function mapInstructionOperands(\n }\n }\n \n+export function mapCallArguments(\n+ args: Array,\n+ fn: (place: Place) => Place\n+): Array {\n+ return args.map((arg) => {\n+ if (arg.kind === \"Identifier\") {\n+ return fn(arg);\n+ } else {\n+ arg.place = fn(arg.place);\n+ return arg;\n+ }\n+ });\n+}\n+\n export function mapPatternOperands(\n pattern: Pattern,\n fn: (place: Place) => Place\ndiff --git a\/compiler\/forget\/src\/Inference\/DropMemoCalls.ts b\/compiler\/forget\/src\/Inference\/DropMemoCalls.ts\nindex e2d25407b2..e19ab0ca04 100644\n--- a\/compiler\/forget\/src\/Inference\/DropMemoCalls.ts\n+++ b\/compiler\/forget\/src\/Inference\/DropMemoCalls.ts\n@@ -21,14 +21,16 @@ export default function (func: HIRFunction): void {\n \/\/\n \/\/ after:\n \/\/ foo = Call $9()\n- instr.value = {\n- kind: \"CallExpression\",\n- callee: fn,\n- \/\/ Drop the args, including the deps array which DCE will remove\n- \/\/ later.\n- args: [],\n- loc: instr.value.loc,\n- };\n+ if (fn.kind === \"Identifier\") {\n+ instr.value = {\n+ kind: \"CallExpression\",\n+ callee: fn,\n+ \/\/ Drop the args, including the deps array which DCE will remove\n+ \/\/ later.\n+ args: [],\n+ loc: instr.value.loc,\n+ };\n+ }\n } else if (name === \"useCallback\") {\n const [fn] = instr.value.args;\n \n@@ -39,16 +41,18 @@ export default function (func: HIRFunction): void {\n \/\/\n \/\/ after:\n \/\/ foo = $19\n- instr.value = {\n- kind: \"LoadLocal\",\n- place: {\n- kind: \"Identifier\",\n- identifier: fn.identifier,\n- effect: Effect.Unknown,\n+ if (fn.kind === \"Identifier\") {\n+ instr.value = {\n+ kind: \"LoadLocal\",\n+ place: {\n+ kind: \"Identifier\",\n+ identifier: fn.identifier,\n+ effect: Effect.Unknown,\n+ loc: instr.value.loc,\n+ },\n loc: instr.value.loc,\n- },\n- loc: instr.value.loc,\n- };\n+ };\n+ }\n }\n }\n }\ndiff --git a\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts b\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\nindex 178ab940d4..69f759f89c 100644\n--- a\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\n+++ b\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\n@@ -673,7 +673,11 @@ function inferBlock(\n \n state.reference(instrValue.receiver, Effect.Mutate);\n for (const arg of instrValue.args) {\n- state.reference(arg, Effect.Mutate);\n+ if (arg.kind === \"Identifier\") {\n+ state.reference(arg, Effect.Mutate);\n+ } else {\n+ state.reference(arg.place, Effect.Mutate);\n+ }\n }\n state.initialize(instrValue, ValueKind.Mutable);\n state.define(instr.lvalue, instrValue);\n@@ -695,7 +699,11 @@ function inferBlock(\n state.reference(instrValue.receiver, Effect.Mutate);\n state.reference(instrValue.property, Effect.Read);\n for (const arg of instrValue.args) {\n- state.reference(arg, Effect.Mutate);\n+ if (arg.kind === \"Identifier\") {\n+ state.reference(arg, Effect.Mutate);\n+ } else {\n+ state.reference(arg.place, Effect.Mutate);\n+ }\n }\n state.initialize(instrValue, ValueKind.Mutable);\n state.define(instr.lvalue, instrValue);\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts b\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\nindex b1464ffe55..fa043b842a 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\n@@ -556,7 +556,7 @@ function codegenInstructionValue(\n }\n case \"CallExpression\": {\n const callee = codegenPlace(cx, instrValue.callee);\n- const args = instrValue.args.map((arg) => codegenPlace(cx, arg));\n+ const args = instrValue.args.map((arg) => codegenArgument(cx, arg));\n value = createCallExpression(instrValue.loc, callee, args);\n break;\n }\n@@ -566,7 +566,7 @@ function codegenInstructionValue(\n receiver,\n t.identifier(instrValue.property)\n );\n- const args = instrValue.args.map((arg) => codegenPlace(cx, arg));\n+ const args = instrValue.args.map((arg) => codegenArgument(cx, arg));\n value = createCallExpression(instrValue.loc, callee, args);\n break;\n }\n@@ -574,7 +574,7 @@ function codegenInstructionValue(\n const receiver = codegenPlace(cx, instrValue.receiver);\n const property = codegenPlace(cx, instrValue.property);\n const callee = t.memberExpression(receiver, property, true);\n- const args = instrValue.args.map((arg) => codegenPlace(cx, arg));\n+ const args = instrValue.args.map((arg) => codegenArgument(cx, arg));\n value = createCallExpression(instrValue.loc, callee, args);\n break;\n }\n@@ -940,6 +940,17 @@ function codegenValue(\n }\n }\n \n+function codegenArgument(\n+ cx: Context,\n+ arg: Place | SpreadPattern\n+): t.Expression | t.SpreadElement {\n+ if (arg.kind === \"Identifier\") {\n+ return codegenPlace(cx, arg);\n+ } else {\n+ return t.spreadElement(codegenPlace(cx, arg.place));\n+ }\n+}\n+\n function codegenPlace(cx: Context, place: Place): t.Expression {\n let tmp = cx.temp.get(place.identifier.id);\n if (tmp != null) {\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/call-spread.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/call-spread.expect.md\nnew file mode 100644\nindex 0000000000..4a7ee944d3\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/call-spread.expect.md\n@@ -0,0 +1,33 @@\n+\n+## Input\n+\n+```javascript\n+function Component(props) {\n+ const x = foo(...props.a, null, ...props.b);\n+ return x;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+function Component(props) {\n+ const $ = React.unstable_useMemoCache(3);\n+ const c_0 = $[0] !== props.a;\n+ const c_1 = $[1] !== props.b;\n+ let t0;\n+ if (c_0 || c_1) {\n+ t0 = foo(...props.a, null, ...props.b);\n+ $[0] = props.a;\n+ $[1] = props.b;\n+ $[2] = t0;\n+ } else {\n+ t0 = $[2];\n+ }\n+ const x = t0;\n+ return x;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/call-spread.js b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/call-spread.js\nnew file mode 100644\nindex 0000000000..5e73773bd1\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/call-spread.js\n@@ -0,0 +1,4 @@\n+function Component(props) {\n+ const x = foo(...props.a, null, ...props.b);\n+ return x;\n+}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/computed-call-spread.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/computed-call-spread.expect.md\nnew file mode 100644\nindex 0000000000..6507397cac\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/computed-call-spread.expect.md\n@@ -0,0 +1,35 @@\n+\n+## Input\n+\n+```javascript\n+function Component(props) {\n+ const x = foo[props.method](...props.a, null, ...props.b);\n+ return x;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+function Component(props) {\n+ const $ = React.unstable_useMemoCache(4);\n+ const c_0 = $[0] !== props.method;\n+ const c_1 = $[1] !== props.a;\n+ const c_2 = $[2] !== props.b;\n+ let t0;\n+ if (c_0 || c_1 || c_2) {\n+ t0 = foo[props.method](...props.a, null, ...props.b);\n+ $[0] = props.method;\n+ $[1] = props.a;\n+ $[2] = props.b;\n+ $[3] = t0;\n+ } else {\n+ t0 = $[3];\n+ }\n+ const x = t0;\n+ return x;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/computed-call-spread.js b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/computed-call-spread.js\nnew file mode 100644\nindex 0000000000..b933b65d4e\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/computed-call-spread.js\n@@ -0,0 +1,4 @@\n+function Component(props) {\n+ const x = foo[props.method](...props.a, null, ...props.b);\n+ return x;\n+}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/error.todo-kitchensink.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/error.todo-kitchensink.expect.md\nindex 6f29931579..3405615979 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/error.todo-kitchensink.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/error.todo-kitchensink.expect.md\n@@ -15,7 +15,6 @@ function foo([a, b], { c, d, e = \"e\" }, f = \"f\", ...args) {\n \n const g = { b() {}, c: () => {} };\n new c(...args);\n- c(...args);\n const { z, aa = \"aa\" } = useCustom();\n \n

dillon1000/react

Files changed