{"commit":{"authoredAt":"2023-03-01T16:27:34-08:00","authorEmail":"joesavona@fb.com","revision":"71db40c6ff97514fd54ea48c23370ebf4bab2e63","authorName":"Joe Savona","shortRevision":"71db40c6ff","subject":"LoadLocal instruction"},"body":"Changes InstructionValue::Place to InstructionValue::LoadLocal for clarity, this \nis intended as the only instruction where a variable can appear as an operand. \nAll other instructions operands will be temporaries.","files":[{"path":"compiler\/forget\/src\/HIR\/BuildHIR.ts","status":"M"},{"path":"compiler\/forget\/src\/HIR\/HIR.ts","status":"M"},{"path":"compiler\/forget\/src\/HIR\/MergeConsecutiveBlocks.ts","status":"M"},{"path":"compiler\/forget\/src\/HIR\/PrintHIR.ts","status":"M"},{"path":"compiler\/forget\/src\/HIR\/visitors.ts","status":"M"},{"path":"compiler\/forget\/src\/Inference\/AnalyseFunctions.ts","status":"M"},{"path":"compiler\/forget\/src\/Inference\/DropMemoCalls.ts","status":"M"},{"path":"compiler\/forget\/src\/Inference\/InferAlias.ts","status":"M"},{"path":"compiler\/forget\/src\/Inference\/InferReferenceEffects.ts","status":"M"},{"path":"compiler\/forget\/src\/Optimization\/ConstantPropagation.ts","status":"M"},{"path":"compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts","status":"M"},{"path":"compiler\/forget\/src\/ReactiveScopes\/BuildReactiveFunction.ts","status":"M"},{"path":"compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts","status":"M"},{"path":"compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts","status":"M"},{"path":"compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts","status":"M"},{"path":"compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts","status":"M"},{"path":"compiler\/forget\/src\/ReactiveScopes\/visitors.ts","status":"M"},{"path":"compiler\/forget\/src\/SSA\/LeaveSSA.ts","status":"M"},{"path":"compiler\/forget\/src\/TypeInference\/InferTypes.ts","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/assignment-in-nested-if.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-within-block.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/hooks-freeze-possibly-mutable-arguments.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/obj-literal-cached-in-if-else.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-conditional.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment.expect.md","status":"M"},{"path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch-non-final-default.expect.md","status":"M"}],"patch":"diff --git a\/compiler\/forget\/src\/HIR\/BuildHIR.ts b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\nindex e8d2230e11..191a6e5f6e 100644\n--- a\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n@@ -110,7 +110,7 @@ export function lower(\n param.node.loc ?? GeneratedSource,\n InstructionKind.Let,\n param,\n- place\n+ { kind: \"LoadLocal\", place, loc: place.loc }\n );\n } else {\n builder.errors.push({\n@@ -628,7 +628,7 @@ function lowerStatement(\n const stmt = stmtPath as NodePath;\n const expression = stmt.get(\"expression\");\n const value = lowerExpression(builder, expression);\n- if (expression.isAssignmentExpression() && value.kind === \"Identifier\") {\n+ if (expression.isAssignmentExpression() && value.kind === \"LoadLocal\") {\n \/\/ already lowered to a place\n return;\n }\n@@ -721,7 +721,12 @@ function lowerExpression(\n switch (exprNode.type) {\n case \"Identifier\": {\n const expr = exprPath as NodePath;\n- return lowerIdentifier(builder, expr);\n+ const place = lowerIdentifier(builder, expr);\n+ return {\n+ kind: \"LoadLocal\",\n+ place,\n+ loc: exprLoc,\n+ };\n }\n case \"NullLiteral\": {\n return {\n@@ -958,7 +963,11 @@ function lowerExpression(\n });\n return { kind: \"UnsupportedNode\", node: expr.node, loc: exprLoc };\n }\n- return last;\n+ return {\n+ kind: \"LoadLocal\", \/\/ TODO: LoadTemp\n+ place: last,\n+ loc: last.loc,\n+ };\n }\n case \"ConditionalExpression\": {\n const expr = exprPath as NodePath;\n@@ -974,7 +983,7 @@ function lowerExpression(\n builder.push({\n id: makeInstructionId(0),\n lvalue: { kind: InstructionKind.Reassign, place: { ...place } },\n- value: lowerExpressionToTemporary(builder, expr.get(\"consequent\")),\n+ value: lowerExpression(builder, expr.get(\"consequent\")),\n loc: exprLoc,\n });\n return {\n@@ -989,7 +998,7 @@ function lowerExpression(\n builder.push({\n id: makeInstructionId(0),\n lvalue: { kind: InstructionKind.Reassign, place: { ...place } },\n- value: lowerExpressionToTemporary(builder, expr.get(\"alternate\")),\n+ value: lowerExpression(builder, expr.get(\"alternate\")),\n loc: exprLoc,\n });\n return {\n@@ -1021,7 +1030,7 @@ function lowerExpression(\n },\n continuationBlock\n );\n- return place;\n+ return { kind: \"LoadLocal\", place, loc: place.loc };\n }\n case \"LogicalExpression\": {\n const expr = exprPath as NodePath;\n@@ -1037,7 +1046,11 @@ function lowerExpression(\n builder.push({\n id: makeInstructionId(0),\n lvalue: { kind: InstructionKind.Reassign, place: { ...place } },\n- value: { ...leftPlace },\n+ value: {\n+ kind: \"LoadLocal\",\n+ place: { ...leftPlace },\n+ loc: leftPlace.loc,\n+ },\n loc: exprLoc,\n });\n return {\n@@ -1051,7 +1064,7 @@ function lowerExpression(\n builder.push({\n id: makeInstructionId(0),\n lvalue: { kind: InstructionKind.Reassign, place: { ...place } },\n- value: lowerExpressionToTemporary(builder, expr.get(\"right\")),\n+ value: lowerExpression(builder, expr.get(\"right\")),\n loc: exprLoc,\n });\n return {\n@@ -1075,7 +1088,7 @@ function lowerExpression(\n builder.push({\n id: makeInstructionId(0),\n lvalue: { kind: InstructionKind.Reassign, place: { ...leftPlace } },\n- value: lowerExpressionToTemporary(builder, expr.get(\"left\")),\n+ value: lowerExpression(builder, expr.get(\"left\")),\n loc: exprLoc,\n });\n builder.terminateWithContinuation(\n@@ -1088,7 +1101,7 @@ function lowerExpression(\n },\n continuationBlock\n );\n- return place;\n+ return { kind: \"LoadLocal\", place, loc: place.loc };\n }\n case \"AssignmentExpression\": {\n const expr = exprPath as NodePath;\n@@ -1096,7 +1109,7 @@ function lowerExpression(\n \n if (builder.currentBlockKind() === \"value\") {\n \/\/ try lowering the RHS in case it also contains errors\n- lowerExpressionToTemporary(builder, expr.get(\"right\"));\n+ lowerExpression(builder, expr.get(\"right\"));\n builder.errors.push({\n reason: `(BuildHIR::lowerExpression) Handle AssignmentExpression within a LogicalExpression or ConditionalExpression`,\n severity: ErrorSeverity.Todo,\n@@ -1112,8 +1125,7 @@ function lowerExpression(\n left.node.loc ?? GeneratedSource,\n InstructionKind.Reassign,\n left,\n- \/\/ NOTE: it's okay not to lower to a temporary here because this is the entire RHS value, not a single operand\n- lowerExpressionToPlace(builder, expr.get(\"right\"))\n+ lowerExpression(builder, expr.get(\"right\"))\n );\n }\n \n@@ -1159,7 +1171,7 @@ function lowerExpression(\n },\n loc: exprLoc,\n });\n- return place;\n+ return { kind: \"LoadLocal\", place, loc: exprLoc };\n }\n case \"MemberExpression\": {\n \/\/ a.b.c += \n@@ -1243,7 +1255,7 @@ function lowerExpression(\n value,\n loc: exprLoc,\n });\n- return place;\n+ return { kind: \"LoadLocal\", place, loc: place.loc };\n }\n case \"JSXElement\": {\n const expr = exprPath as NodePath;\n@@ -1496,21 +1508,27 @@ function lowerExpression(\n },\n loc: expr.node.loc ?? GeneratedSource,\n });\n- const identifier = argument as NodePath;\n- const place = lowerIdentifier(builder, identifier);\n+ const identifier = lowerIdentifier(\n+ builder,\n+ argument as NodePath\n+ );\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { place: { ...place }, kind: InstructionKind.Reassign },\n+ lvalue: { place: { ...identifier }, kind: InstructionKind.Reassign },\n value: {\n kind: \"BinaryExpression\",\n operator: expr.node.operator === \"++\" ? \"+\" : \"-\",\n- left: { ...place },\n+ left: { ...identifier },\n right: { ...temp },\n loc: exprLoc,\n },\n loc: exprLoc,\n });\n- return place;\n+ return {\n+ kind: \"LoadLocal\",\n+ place: { ...identifier },\n+ loc: exprLoc,\n+ };\n }\n default: {\n builder.errors.push({\n@@ -1703,8 +1721,8 @@ function lowerExpressionToTemporary(\n exprPath: NodePath\n ): Place {\n const value = lowerExpression(builder, exprPath);\n- if (value.kind === \"Identifier\" && value.identifier.name === null) {\n- return value;\n+ if (value.kind === \"LoadLocal\" && value.place.identifier.name === null) {\n+ return value.place;\n }\n const exprLoc = exprPath.node.loc ?? GeneratedSource;\n const place: Place = buildTemporaryPlace(builder, exprLoc);\n@@ -1722,8 +1740,8 @@ function lowerExpressionToPlace(\n exprPath: NodePath\n ): Place {\n const value = lowerExpression(builder, exprPath);\n- if (value.kind === \"Identifier\") {\n- return value;\n+ if (value.kind === \"LoadLocal\") {\n+ return value.place;\n }\n const exprLoc = exprPath.node.loc ?? GeneratedSource;\n const place: Place = buildTemporaryPlace(builder, exprLoc);\n@@ -1855,15 +1873,15 @@ function lowerAssignment(\n value,\n loc,\n });\n- return place;\n+ return { kind: \"LoadLocal\", place, loc: place.loc };\n }\n case \"MemberExpression\": {\n const lvalue = lvaluePath as NodePath;\n const property = lvalue.get(\"property\");\n const object = lowerExpressionToTemporary(builder, lvalue.get(\"object\"));\n let valuePlace: Place;\n- if (value.kind === \"Identifier\") {\n- valuePlace = value;\n+ if (value.kind === \"LoadLocal\") {\n+ valuePlace = value.place;\n } else {\n valuePlace = buildTemporaryPlace(builder, loc);\n builder.push({\n@@ -1958,7 +1976,7 @@ function lowerAssignment(\n }\n return hasError\n ? { kind: \"UnsupportedNode\", node: lvalueNode, loc }\n- : arrayPlace;\n+ : { kind: \"LoadLocal\", place: arrayPlace, loc: arrayPlace.loc };\n }\n case \"ObjectPattern\": {\n const lvalue = lvaluePath as NodePath;\n@@ -2013,7 +2031,7 @@ function lowerAssignment(\n }\n return hasError\n ? { kind: \"UnsupportedNode\", node: lvalueNode, loc }\n- : objectPlace;\n+ : { kind: \"LoadLocal\", place: objectPlace, loc: objectPlace.loc };\n }\n default: {\n builder.errors.push({\ndiff --git a\/compiler\/forget\/src\/HIR\/HIR.ts b\/compiler\/forget\/src\/HIR\/HIR.ts\nindex 5017d6b5e4..6a4d320259 100644\n--- a\/compiler\/forget\/src\/HIR\/HIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/HIR.ts\n@@ -396,7 +396,11 @@ export type Phi = {\n * Operands are therefore always a Place.\n *\/\n export type InstructionValue =\n- | Place\n+ | {\n+ kind: \"LoadLocal\";\n+ place: Place;\n+ loc: SourceLocation;\n+ }\n | {\n kind: \"Primitive\";\n value: number | boolean | string | null | undefined;\ndiff --git a\/compiler\/forget\/src\/HIR\/MergeConsecutiveBlocks.ts b\/compiler\/forget\/src\/HIR\/MergeConsecutiveBlocks.ts\nindex 19af293d69..3c1a562dc7 100644\n--- a\/compiler\/forget\/src\/HIR\/MergeConsecutiveBlocks.ts\n+++ b\/compiler\/forget\/src\/HIR\/MergeConsecutiveBlocks.ts\n@@ -69,9 +69,13 @@ export function mergeConsecutiveBlocks(fn: HIRFunction): void {\n kind: InstructionKind.Const,\n },\n value: {\n- kind: \"Identifier\",\n- identifier: operand,\n- effect: Effect.Read,\n+ kind: \"LoadLocal\",\n+ place: {\n+ kind: \"Identifier\",\n+ identifier: operand,\n+ effect: Effect.Read,\n+ loc: GeneratedSource,\n+ },\n loc: GeneratedSource,\n },\n loc: GeneratedSource,\ndiff --git a\/compiler\/forget\/src\/HIR\/PrintHIR.ts b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\nindex 8e8da1e6c4..f89e5a48c5 100644\n--- a\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n@@ -304,8 +304,8 @@ export function printInstructionValue(instrValue: ReactiveValue): string {\n value = `UnsupportedNode(${generate(instrValue.node).code})`;\n break;\n }\n- case \"Identifier\": {\n- value = printPlace(instrValue);\n+ case \"LoadLocal\": {\n+ value = `LoadLocal ${printPlace(instrValue.place)}`;\n break;\n }\n case \"PropertyLoad\": {\ndiff --git a\/compiler\/forget\/src\/HIR\/visitors.ts b\/compiler\/forget\/src\/HIR\/visitors.ts\nindex edad1e8ca6..c8485f3d92 100644\n--- a\/compiler\/forget\/src\/HIR\/visitors.ts\n+++ b\/compiler\/forget\/src\/HIR\/visitors.ts\n@@ -48,8 +48,8 @@ export function* eachInstructionValueOperand(\n yield* instrValue.args;\n break;\n }\n- case \"Identifier\": {\n- yield instrValue;\n+ case \"LoadLocal\": {\n+ yield instrValue.place;\n break;\n }\n case \"PropertyLoad\": {\n@@ -177,8 +177,8 @@ export function mapInstructionOperands(\n instrValue.value = fn(instrValue.value);\n break;\n }\n- case \"Identifier\": {\n- instr.value = fn(instrValue);\n+ case \"LoadLocal\": {\n+ instrValue.place = fn(instrValue.place);\n break;\n }\n case \"NewExpression\":\ndiff --git a\/compiler\/forget\/src\/Inference\/AnalyseFunctions.ts b\/compiler\/forget\/src\/Inference\/AnalyseFunctions.ts\nindex 12150b67ee..12678f49e6 100644\n--- a\/compiler\/forget\/src\/Inference\/AnalyseFunctions.ts\n+++ b\/compiler\/forget\/src\/Inference\/AnalyseFunctions.ts\n@@ -62,9 +62,9 @@ export default function analyseFunctions(func: HIRFunction) {\n );\n break;\n }\n- case \"Identifier\": {\n+ case \"LoadLocal\": {\n if (instr.lvalue.place.identifier.name === null) {\n- state.declareTemporary(instr.lvalue.place, instr.value);\n+ state.declareTemporary(instr.lvalue.place, instr.value.place);\n }\n break;\n }\ndiff --git a\/compiler\/forget\/src\/Inference\/DropMemoCalls.ts b\/compiler\/forget\/src\/Inference\/DropMemoCalls.ts\nindex 6e9e538f2e..8c9353b768 100644\n--- a\/compiler\/forget\/src\/Inference\/DropMemoCalls.ts\n+++ b\/compiler\/forget\/src\/Inference\/DropMemoCalls.ts\n@@ -40,9 +40,13 @@ export default function (func: HIRFunction) {\n \/\/ after:\n \/\/ foo = $19\n instr.value = {\n- kind: \"Identifier\",\n- identifier: fn.identifier,\n- effect: Effect.Unknown,\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 }\ndiff --git a\/compiler\/forget\/src\/Inference\/InferAlias.ts b\/compiler\/forget\/src\/Inference\/InferAlias.ts\nindex c101551233..1bd5df17a6 100644\n--- a\/compiler\/forget\/src\/Inference\/InferAlias.ts\n+++ b\/compiler\/forget\/src\/Inference\/InferAlias.ts\n@@ -33,11 +33,11 @@ function inferInstr(instr: Instruction, state: AliasAnalyser) {\n const { lvalue, value: instrValue } = instr;\n let alias: Place | null = null;\n switch (instrValue.kind) {\n- case \"Identifier\": {\n- if (isPrimitiveType(instrValue.identifier)) {\n+ case \"LoadLocal\": {\n+ if (isPrimitiveType(instrValue.place.identifier)) {\n return;\n }\n- alias = instrValue;\n+ alias = instrValue.place;\n break;\n }\n case \"ComputedLoad\":\ndiff --git a\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts b\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\nindex 1f851f5530..f886ba318b 100644\n--- a\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\n+++ b\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\n@@ -188,7 +188,7 @@ class InferenceState {\n *\/\n initialize(value: InstructionValue, kind: ValueKind) {\n invariant(\n- value.kind !== \"Identifier\",\n+ value.kind !== \"LoadLocal\",\n \"Expected all top-level identifiers to be defined as variables, not values\"\n );\n this.#values.set(value, kind);\n@@ -782,12 +782,12 @@ function inferBlock(\n state.alias(lvalue.place, instrValue.value);\n continue;\n }\n- case \"Identifier\": {\n- state.reference(instrValue, Effect.Capture);\n+ case \"LoadLocal\": {\n+ state.reference(instrValue.place, Effect.Capture);\n const lvalue = instr.lvalue;\n lvalue.place.effect = Effect.Mutate;\n \/\/ direct aliasing: `a = b`;\n- state.alias(lvalue.place, instrValue);\n+ state.alias(lvalue.place, instrValue.place);\n continue;\n }\n default: {\ndiff --git a\/compiler\/forget\/src\/Optimization\/ConstantPropagation.ts b\/compiler\/forget\/src\/Optimization\/ConstantPropagation.ts\nindex 4df3188efb..a6e46a8483 100644\n--- a\/compiler\/forget\/src\/Optimization\/ConstantPropagation.ts\n+++ b\/compiler\/forget\/src\/Optimization\/ConstantPropagation.ts\n@@ -308,8 +308,8 @@ function evaluateInstruction(\n }\n return null;\n }\n- case \"Identifier\": {\n- return read(constants, value);\n+ case \"LoadLocal\": {\n+ return read(constants, value.place);\n }\n default: {\n \/\/ TODO: handle more cases\ndiff --git a\/compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts b\/compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts\nindex 1addf063f7..42ddc812a8 100644\n--- a\/compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts\n+++ b\/compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts\n@@ -100,7 +100,7 @@ function pruneableValue(value: InstructionValue): boolean {\n case \"ComputedLoad\":\n case \"ComputedStore\":\n case \"FunctionExpression\":\n- case \"Identifier\":\n+ case \"LoadLocal\":\n case \"JsxExpression\":\n case \"JsxFragment\":\n case \"JSXText\":\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/BuildReactiveFunction.ts b\/compiler\/forget\/src\/ReactiveScopes\/BuildReactiveFunction.ts\nindex f005478b54..0abbdfcb9a 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/BuildReactiveFunction.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/BuildReactiveFunction.ts\n@@ -484,7 +484,11 @@ class Driver {\n return {\n block: defaultBlock.id,\n place: defaultBlock.terminal.test,\n- value: defaultBlock.terminal.test,\n+ value: {\n+ kind: \"LoadLocal\",\n+ place: defaultBlock.terminal.test,\n+ loc: defaultBlock.terminal.test.loc,\n+ },\n id: defaultBlock.terminal.id,\n };\n } else if (defaultBlock.instructions.length === 1) {\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts b\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\nindex 33ff1c90a8..035775c8a6 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\n@@ -696,8 +696,8 @@ function codegenInstructionValue(\n );\n break;\n }\n- case \"Identifier\": {\n- value = codegenPlace(cx, instrValue);\n+ case \"LoadLocal\": {\n+ value = codegenPlace(cx, instrValue.place);\n break;\n }\n case \"FunctionExpression\": {\n@@ -714,7 +714,7 @@ function codegenInstructionValue(\n }\n case \"TypeCastExpression\": {\n value = t.typeCastExpression(\n- codegenInstructionValue(cx, instrValue.value),\n+ codegenPlace(cx, instrValue.value),\n instrValue.type\n );\n break;\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts b\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts\nindex 9c67fe1506..5f686ad438 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts\n@@ -171,7 +171,7 @@ function mayAllocate(value: InstructionValue): boolean {\n case \"LoadGlobal\":\n case \"TypeCastExpression\":\n case \"BinaryExpression\":\n- case \"Identifier\":\n+ case \"LoadLocal\":\n case \"PropertyLoad\":\n case \"ComputedLoad\":\n case \"JSXText\":\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts b\/compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts\nindex 07a973a061..9c91b5ea2d 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts\n@@ -57,7 +57,7 @@ class Visitor extends ReactiveFunctionVisitor {\n if (\n instruction.lvalue !== null &&\n instruction.lvalue.place.identifier.name === null &&\n- instruction.value.kind !== \"Identifier\"\n+ instruction.value.kind !== \"LoadLocal\"\n ) {\n state.temporaries.set(instruction.lvalue.place.identifier, 0);\n }\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts b\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts\nindex bdcaacf46b..2f1652e0fb 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts\n@@ -676,14 +676,14 @@ function visitInstructionValue(\n value: ReactiveValue,\n lvalue: LValue | null\n ): void {\n- if (value.kind === \"Identifier\" && lvalue !== null) {\n+ if (value.kind === \"LoadLocal\" && lvalue !== null) {\n if (\n- value.identifier.name !== null &&\n+ value.place.identifier.name !== null &&\n lvalue.place.identifier.name === null\n ) {\n- context.declareTemporary(lvalue.place, value);\n+ context.declareTemporary(lvalue.place, value.place);\n } else {\n- context.visitOperand(value);\n+ context.visitOperand(value.place);\n }\n } else if (value.kind === \"PropertyLoad\") {\n if (lvalue !== null) {\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/visitors.ts b\/compiler\/forget\/src\/ReactiveScopes\/visitors.ts\nindex 6a5a5d8f3f..8abaa361b4 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/visitors.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/visitors.ts\n@@ -91,12 +91,12 @@ export class ReactiveFunctionVisitor {\n }\n case \"return\": {\n if (terminal.value !== null) {\n- this.visitValue(terminal.id, terminal.value, state);\n+ this.visitPlace(terminal.id, terminal.value, state);\n }\n break;\n }\n case \"throw\": {\n- this.visitValue(terminal.id, terminal.value, state);\n+ this.visitPlace(terminal.id, terminal.value, state);\n break;\n }\n case \"for\": {\n@@ -112,7 +112,7 @@ export class ReactiveFunctionVisitor {\n break;\n }\n case \"if\": {\n- this.visitValue(terminal.id, terminal.test, state);\n+ this.visitPlace(terminal.id, terminal.test, state);\n this.visitBlock(terminal.consequent, state);\n if (terminal.alternate !== null) {\n this.visitBlock(terminal.alternate, state);\n@@ -120,7 +120,7 @@ export class ReactiveFunctionVisitor {\n break;\n }\n case \"switch\": {\n- this.visitValue(terminal.id, terminal.test, state);\n+ this.visitPlace(terminal.id, terminal.test, state);\n for (const case_ of terminal.cases) {\n if (case_.test !== null) {\n this.visitPlace(terminal.id, case_.test, state);\ndiff --git a\/compiler\/forget\/src\/SSA\/LeaveSSA.ts b\/compiler\/forget\/src\/SSA\/LeaveSSA.ts\nindex 08087d26d6..1104ca6007 100644\n--- a\/compiler\/forget\/src\/SSA\/LeaveSSA.ts\n+++ b\/compiler\/forget\/src\/SSA\/LeaveSSA.ts\n@@ -240,9 +240,13 @@ export function leaveSSA(fn: HIRFunction): void {\n value:\n initOperand !== null\n ? {\n- kind: \"Identifier\",\n- identifier: initOperand,\n- effect: Effect.Read,\n+ kind: \"LoadLocal\",\n+ place: {\n+ kind: \"Identifier\",\n+ identifier: initOperand,\n+ effect: Effect.Read,\n+ loc: GeneratedSource,\n+ },\n loc: GeneratedSource,\n }\n : {\ndiff --git a\/compiler\/forget\/src\/TypeInference\/InferTypes.ts b\/compiler\/forget\/src\/TypeInference\/InferTypes.ts\nindex 71aa66994a..d7670911dc 100644\n--- a\/compiler\/forget\/src\/TypeInference\/InferTypes.ts\n+++ b\/compiler\/forget\/src\/TypeInference\/InferTypes.ts\n@@ -107,8 +107,8 @@ function* generateInstructionTypes(\n break;\n }\n \n- case \"Identifier\": {\n- yield equation(left, value.identifier.type);\n+ case \"LoadLocal\": {\n+ yield equation(left, value.place.identifier.type);\n break;\n }\n \ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/assignment-in-nested-if.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/assignment-in-nested-if.expect.md\nindex 5ee3cdac92..4f1f37ae5c 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/assignment-in-nested-if.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/assignment-in-nested-if.expect.md\n@@ -24,14 +24,12 @@ function useBar(props) {\n let z = undefined;\n if (props.a) {\n if (props.b) {\n- let t0;\n if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n- t0 = baz();\n- $[0] = t0;\n+ z = baz();\n+ $[0] = z;\n } else {\n- t0 = $[0];\n+ z = $[0];\n }\n- z = t0;\n }\n }\n return z;\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\nindex d60e6670e9..ebdfd83a0e 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-within-block.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/capturing-function-within-block.expect.md\n@@ -30,17 +30,16 @@ function component(a) {\n z = $[1];\n }\n const c_2 = $[2] !== z;\n- let t0;\n+ let x;\n if (c_2) {\n- t0 = function () {\n+ x = function () {\n z;\n };\n $[2] = z;\n- $[3] = t0;\n+ $[3] = x;\n } else {\n- t0 = $[3];\n+ x = $[3];\n }\n- const x = t0;\n return x;\n }\n \ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/hooks-freeze-possibly-mutable-arguments.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/hooks-freeze-possibly-mutable-arguments.expect.md\nindex 77dbdb1337..feec1ee910 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/hooks-freeze-possibly-mutable-arguments.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/hooks-freeze-possibly-mutable-arguments.expect.md\n@@ -33,14 +33,12 @@ function Component(props) {\n if (cond) {\n a = x;\n } else {\n- let t0;\n if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n- t0 = [];\n- $[0] = t0;\n+ a = [];\n+ $[0] = a;\n } else {\n- t0 = $[0];\n+ a = $[0];\n }\n- a = t0;\n }\n \n useFreeze(a);\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/obj-literal-cached-in-if-else.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/obj-literal-cached-in-if-else.expect.md\nindex 9a1877dcd6..c552f392d3 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/obj-literal-cached-in-if-else.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/obj-literal-cached-in-if-else.expect.md\n@@ -23,26 +23,22 @@ function foo(a, b, c, d) {\n let x = undefined;\n if (someVal) {\n const c_0 = $[0] !== b;\n- let t0;\n if (c_0) {\n- t0 = { b: b };\n+ x = { b: b };\n $[0] = b;\n- $[1] = t0;\n+ $[1] = x;\n } else {\n- t0 = $[1];\n+ x = $[1];\n }\n- x = t0;\n } else {\n const c_2 = $[2] !== c;\n- let t1;\n if (c_2) {\n- t1 = { c: c };\n+ x = { c: c };\n $[2] = c;\n- $[3] = t1;\n+ $[3] = x;\n } else {\n- t1 = $[3];\n+ x = $[3];\n }\n- x = t1;\n }\n return x;\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-conditional.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-conditional.expect.md\nindex c7552085ba..e9514dd4a5 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-conditional.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment-conditional.expect.md\n@@ -36,29 +36,27 @@ function Component(props) {\n }\n const y = x;\n if (props.p1) {\n- let t0;\n if ($[2] === Symbol.for(\"react.memo_cache_sentinel\")) {\n- t0 = [];\n- $[2] = t0;\n+ x = [];\n+ $[2] = x;\n } else {\n- t0 = $[2];\n+ x = $[2];\n }\n- x = t0;\n }\n \n y.push(props.p2);\n const c_3 = $[3] !== x;\n const c_4 = $[4] !== y;\n- let t1;\n+ let t0;\n if (c_3 || c_4) {\n- t1 = <\/Component>;\n+ t0 = <\/Component>;\n $[3] = x;\n $[4] = y;\n- $[5] = t1;\n+ $[5] = t0;\n } else {\n- t1 = $[5];\n+ t0 = $[5];\n }\n- return t1;\n+ return t0;\n }\n \n ```\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment.expect.md\nindex 0b3212b74d..f3d722749e 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/reassignment.expect.md\n@@ -30,14 +30,12 @@ function Component(props) {\n x = [];\n x.push(props.p0);\n y = x;\n- let t0;\n if ($[4] === Symbol.for(\"react.memo_cache_sentinel\")) {\n- t0 = [];\n- $[4] = t0;\n+ x = [];\n+ $[4] = x;\n } else {\n- t0 = $[4];\n+ x = $[4];\n }\n- x = t0;\n \n y.push(props.p1);\n $[0] = props.p0;\n@@ -50,16 +48,16 @@ function Component(props) {\n }\n const c_5 = $[5] !== x;\n const c_6 = $[6] !== y;\n- let t1;\n+ let t0;\n if (c_5 || c_6) {\n- t1 = <\/Component>;\n+ t0 = <\/Component>;\n $[5] = x;\n $[6] = y;\n- $[7] = t1;\n+ $[7] = t0;\n } else {\n- t1 = $[7];\n+ t0 = $[7];\n }\n- return t1;\n+ return t0;\n }\n \n ```\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch-non-final-default.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch-non-final-default.expect.md\nindex efe6294bf7..edc2f43429 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch-non-final-default.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/switch-non-final-default.expect.md\n@@ -45,14 +45,12 @@ function Component(props) {\n }\n case true: {\n x.push(props.p2);\n- let t0;\n if ($[3] === Symbol.for(\"react.memo_cache_sentinel\")) {\n- t0 = [];\n- $[3] = t0;\n+ y = [];\n+ $[3] = y;\n } else {\n- t0 = $[3];\n+ y = $[3];\n }\n- y = t0;\n break bb1;\n }\n default: {\n@@ -81,16 +79,16 @@ function Component(props) {\n y.push(props.p4);\n const c_6 = $[6] !== y;\n const c_7 = $[7] !== child;\n- let t1;\n+ let t0;\n if (c_6 || c_7) {\n- t1 = {child}<\/Component>;\n+ t0 = {child}<\/Component>;\n $[6] = y;\n $[7] = child;\n- $[8] = t1;\n+ $[8] = t0;\n } else {\n- t1 = $[8];\n+ t0 = $[8];\n }\n- return t1;\n+ return t0;\n }\n \n ```\n","parents":["08c1eda7fffdee4ebc590a2cc97dc0bde3cc268e"]}

dillon1000/react

Files changed