{"body":"","files":[{"status":"M","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\/ValidateConsistentIdentifiers.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\/InferAlias.ts"},{"status":"M","path":"compiler\/forget\/src\/Inference\/InferAliasForStores.ts"},{"status":"M","path":"compiler\/forget\/src\/Inference\/InferMutableLifetimes.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\/AlignReactiveScopesToBlockScopes.ts"},{"status":"M","path":"compiler\/forget\/src\/ReactiveScopes\/BuildReactiveBlocks.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\/InferReactiveIdentifiers.ts"},{"status":"M","path":"compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts"},{"status":"M","path":"compiler\/forget\/src\/ReactiveScopes\/MergeOverlappingReactiveScopes.ts"},{"status":"M","path":"compiler\/forget\/src\/ReactiveScopes\/PrintReactiveFunction.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\/PruneTemporaryLValues.ts"},{"status":"M","path":"compiler\/forget\/src\/ReactiveScopes\/RenameVariables.ts"},{"status":"M","path":"compiler\/forget\/src\/ReactiveScopes\/visitors.ts"},{"status":"M","path":"compiler\/forget\/src\/SSA\/EliminateRedundantPhi.ts"},{"status":"M","path":"compiler\/forget\/src\/SSA\/EnterSSA.ts"},{"status":"M","path":"compiler\/forget\/src\/SSA\/LeaveSSA.ts"},{"status":"M","path":"compiler\/forget\/src\/TypeInference\/InferTypes.ts"}],"commit":{"shortRevision":"36d1fa2569","authorName":"Joe Savona","authorEmail":"joesavona@fb.com","revision":"36d1fa2569dd544d2e1b69215feceaf3c25747f3","authoredAt":"2023-03-02T14:19:18-08:00","subject":"[storelocal] Instruction lvalue is just a Place"},"patch":"diff --git a\/compiler\/forget\/src\/HIR\/BuildHIR.ts b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\nindex 025974703d..bc323517ed 100644\n--- a\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n@@ -614,7 +614,7 @@ function lowerStatement(\n value = buildTemporaryPlace(builder, id.node.loc ?? GeneratedSource);\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { place: { ...value }, kind: InstructionKind.Const },\n+ lvalue: { ...value },\n value: {\n kind: \"Primitive\",\n value: undefined,\n@@ -647,7 +647,7 @@ function lowerStatement(\n );\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { kind: InstructionKind.Const, place },\n+ lvalue: place,\n value,\n loc: stmt.node.loc ?? GeneratedSource,\n });\n@@ -746,13 +746,10 @@ function lowerStatement(\n });\n builder.push({\n id: makeInstructionId(0),\n- lvalue: {\n- place: buildTemporaryPlace(\n- builder,\n- stmtPath.node.loc ?? GeneratedSource\n- ),\n- kind: InstructionKind.Const,\n- },\n+ lvalue: buildTemporaryPlace(\n+ builder,\n+ stmtPath.node.loc ?? GeneratedSource\n+ ),\n loc: stmtPath.node.loc ?? GeneratedSource,\n value: {\n kind: \"UnsupportedNode\",\n@@ -1043,7 +1040,7 @@ function lowerExpression(\n const consequentBlock = builder.enter(\"value\", (_blockId) => {\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { kind: InstructionKind.Reassign, place: { ...place } },\n+ lvalue: { ...place },\n value: lowerExpression(builder, expr.get(\"consequent\")),\n loc: exprLoc,\n });\n@@ -1058,7 +1055,7 @@ function lowerExpression(\n const alternateBlock = builder.enter(\"value\", (_blockId) => {\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { kind: InstructionKind.Reassign, place: { ...place } },\n+ lvalue: { ...place },\n value: lowerExpression(builder, expr.get(\"alternate\")),\n loc: exprLoc,\n });\n@@ -1106,7 +1103,7 @@ function lowerExpression(\n const consequent = builder.enter(\"value\", () => {\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { kind: InstructionKind.Reassign, place: { ...place } },\n+ lvalue: { ...place },\n value: {\n kind: \"LoadLocal\",\n place: { ...leftPlace },\n@@ -1124,7 +1121,7 @@ function lowerExpression(\n const alternate = builder.enter(\"value\", () => {\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { kind: InstructionKind.Reassign, place: { ...place } },\n+ lvalue: { ...place },\n value: lowerExpression(builder, expr.get(\"right\")),\n loc: exprLoc,\n });\n@@ -1148,7 +1145,7 @@ function lowerExpression(\n );\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { kind: InstructionKind.Reassign, place: { ...leftPlace } },\n+ lvalue: { ...leftPlace },\n value: lowerExpression(builder, expr.get(\"left\")),\n loc: exprLoc,\n });\n@@ -1225,8 +1222,7 @@ function lowerExpression(\n builder.push({\n id: makeInstructionId(0),\n lvalue: {\n- place: { ...binaryPlace },\n- kind: InstructionKind.Const,\n+ ...binaryPlace,\n },\n value: {\n kind: \"BinaryExpression\",\n@@ -1240,7 +1236,7 @@ function lowerExpression(\n const result = buildTemporaryPlace(builder, exprLoc);\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { place: { ...result }, kind: InstructionKind.Const },\n+ lvalue: { ...result },\n value: {\n kind: \"StoreLocal\",\n lvalue: {\n@@ -1270,8 +1266,7 @@ function lowerExpression(\n builder.push({\n id: makeInstructionId(0),\n lvalue: {\n- place: { ...previousValuePlace },\n- kind: InstructionKind.Const,\n+ ...previousValuePlace,\n },\n value,\n loc: leftExpr.node.loc ?? GeneratedSource,\n@@ -1281,8 +1276,7 @@ function lowerExpression(\n builder.push({\n id: makeInstructionId(0),\n lvalue: {\n- place: { ...newValuePlace },\n- kind: InstructionKind.Const,\n+ ...newValuePlace,\n },\n value: {\n kind: \"BinaryExpression\",\n@@ -1332,7 +1326,7 @@ function lowerExpression(\n const place: Place = buildTemporaryPlace(builder, exprLoc);\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { place: { ...place }, kind: InstructionKind.Const },\n+ lvalue: { ...place },\n value,\n loc: exprLoc,\n });\n@@ -1581,7 +1575,7 @@ function lowerExpression(\n );\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { place: { ...primitiveTemp }, kind: InstructionKind.Const },\n+ lvalue: { ...primitiveTemp },\n value: {\n kind: \"Primitive\",\n value: 1,\n@@ -1599,7 +1593,7 @@ function lowerExpression(\n );\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { place: { ...temp }, kind: InstructionKind.Const },\n+ lvalue: { ...temp },\n value: {\n kind: \"BinaryExpression\",\n operator: expr.node.operator === \"++\" ? \"+\" : \"-\",\n@@ -1611,16 +1605,10 @@ function lowerExpression(\n });\n builder.push({\n id: makeInstructionId(0),\n- lvalue: {\n- place: buildTemporaryPlace(builder, exprLoc),\n- kind: InstructionKind.Const,\n- },\n+ lvalue: buildTemporaryPlace(builder, exprLoc),\n value: {\n kind: \"StoreLocal\",\n- lvalue: {\n- place: { ...identifier },\n- kind: InstructionKind.Reassign,\n- },\n+ lvalue: { place: { ...identifier }, kind: InstructionKind.Reassign },\n value: { ...temp },\n loc: exprLoc,\n },\n@@ -1723,7 +1711,7 @@ function lowerJsxElementName(\n loc: exprLoc,\n },\n loc: exprLoc,\n- lvalue: { place: { ...place }, kind: InstructionKind.Const },\n+ lvalue: { ...place },\n });\n return { ...place };\n }\n@@ -1740,9 +1728,9 @@ function lowerJsxElementName(\n loc: exprLoc,\n },\n loc: exprLoc,\n- lvalue: { place, kind: InstructionKind.Const },\n+ lvalue: { ...place },\n });\n- return { ...place };\n+ return place;\n }\n }\n \n@@ -1777,7 +1765,7 @@ function lowerJsxElement(\n loc: exprLoc,\n },\n loc: exprLoc,\n- lvalue: { place: { ...place }, kind: InstructionKind.Const },\n+ lvalue: { ...place },\n });\n return { ...place };\n }\n@@ -1792,7 +1780,7 @@ function lowerJsxElement(\n loc: exprLoc,\n },\n loc: exprLoc,\n- lvalue: { place: { ...place }, kind: InstructionKind.Const },\n+ lvalue: { ...place },\n });\n return place;\n } else {\n@@ -1812,7 +1800,7 @@ function lowerJsxElement(\n loc: exprLoc,\n },\n loc: exprLoc,\n- lvalue: { place: { ...place }, kind: InstructionKind.Const },\n+ lvalue: { ...place },\n });\n return place;\n }\n@@ -1832,7 +1820,7 @@ function lowerExpressionToTemporary(\n id: makeInstructionId(0),\n value: value,\n loc: exprLoc,\n- lvalue: { place: { ...place }, kind: InstructionKind.Const },\n+ lvalue: { ...place },\n });\n return place;\n }\n@@ -1851,7 +1839,7 @@ function lowerExpressionToPlace(\n id: makeInstructionId(0),\n value: value,\n loc: exprLoc,\n- lvalue: { place: { ...place }, kind: InstructionKind.Const },\n+ lvalue: { ...place },\n });\n return place;\n }\n@@ -1869,10 +1857,7 @@ function lowerExpressionToVoid(\n id: makeInstructionId(0),\n value: instr,\n loc: exprLoc,\n- lvalue: {\n- place: buildTemporaryPlace(builder, exprLoc),\n- kind: InstructionKind.Const,\n- },\n+ lvalue: buildTemporaryPlace(builder, exprLoc),\n });\n }\n \n@@ -1899,10 +1884,7 @@ function lowerIdentifier(\n id: makeInstructionId(0),\n value,\n loc: place.loc,\n- lvalue: {\n- place: { ...place },\n- kind: InstructionKind.Const,\n- },\n+ lvalue: { ...place },\n });\n return place;\n }\n@@ -1972,13 +1954,10 @@ function lowerAssignment(\n };\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { place: { ...temporary }, kind },\n+ lvalue: { ...temporary },\n value: {\n kind: \"StoreLocal\",\n- lvalue: {\n- place: { ...place },\n- kind,\n- },\n+ lvalue: { place: { ...place }, kind },\n value,\n loc,\n },\n@@ -2050,7 +2029,7 @@ function lowerAssignment(\n );\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { place: { ...property }, kind: InstructionKind.Const },\n+ lvalue: { ...property },\n value: {\n kind: \"Primitive\",\n value: i,\n@@ -2061,7 +2040,7 @@ function lowerAssignment(\n const propertyPlace = buildTemporaryPlace(builder, property.loc);\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { place: { ...propertyPlace }, kind: InstructionKind.Const },\n+ lvalue: { ...propertyPlace },\n value: {\n kind: \"ComputedLoad\",\n loc,\n@@ -2123,7 +2102,7 @@ function lowerAssignment(\n );\n builder.push({\n id: makeInstructionId(0),\n- lvalue: { place: { ...propertyPlace }, kind: InstructionKind.Const },\n+ lvalue: { ...propertyPlace },\n value: {\n kind: \"PropertyLoad\",\n loc,\ndiff --git a\/compiler\/forget\/src\/HIR\/HIR.ts b\/compiler\/forget\/src\/HIR\/HIR.ts\nindex 767fda771b..f88b5c23f1 100644\n--- a\/compiler\/forget\/src\/HIR\/HIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/HIR.ts\n@@ -81,7 +81,7 @@ export type ReactiveTerminalStatement<\n \n export type ReactiveInstruction = {\n id: InstructionId;\n- lvalue: LValue | null;\n+ lvalue: Place | null;\n value: ReactiveValue;\n loc: SourceLocation;\n };\n@@ -365,7 +365,7 @@ export type TernaryTerminal = {\n *\/\n export type Instruction = {\n id: InstructionId;\n- lvalue: LValue;\n+ lvalue: Place;\n value: InstructionValue;\n loc: SourceLocation;\n };\ndiff --git a\/compiler\/forget\/src\/HIR\/MergeConsecutiveBlocks.ts b\/compiler\/forget\/src\/HIR\/MergeConsecutiveBlocks.ts\nindex 3c1a562dc7..0c2c166a45 100644\n--- a\/compiler\/forget\/src\/HIR\/MergeConsecutiveBlocks.ts\n+++ b\/compiler\/forget\/src\/HIR\/MergeConsecutiveBlocks.ts\n@@ -12,7 +12,6 @@ import {\n GeneratedSource,\n HIRFunction,\n Instruction,\n- InstructionKind,\n } from \".\/HIR\";\n \n \/**\n@@ -60,13 +59,10 @@ export function mergeConsecutiveBlocks(fn: HIRFunction): void {\n const instr: Instruction = {\n id: predecessor.terminal.id,\n lvalue: {\n- place: {\n- kind: \"Identifier\",\n- identifier: phi.id,\n- effect: Effect.Mutate,\n- loc: GeneratedSource,\n- },\n- kind: InstructionKind.Const,\n+ kind: \"Identifier\",\n+ identifier: phi.id,\n+ effect: Effect.Mutate,\n+ loc: GeneratedSource,\n },\n value: {\n kind: \"LoadLocal\",\ndiff --git a\/compiler\/forget\/src\/HIR\/PrintHIR.ts b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\nindex 8efb151920..b9890c67f8 100644\n--- a\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n@@ -106,7 +106,7 @@ export function printInstruction(instr: ReactiveInstruction): string {\n const value = printInstructionValue(instr.value);\n \n if (instr.lvalue !== null) {\n- return `${id} ${printLValue(instr.lvalue)} = ${value}`;\n+ return `${id} ${printPlace(instr.lvalue)} = ${value}`;\n } else {\n return `${id} ${value}`;\n }\ndiff --git a\/compiler\/forget\/src\/HIR\/ValidateConsistentIdentifiers.ts b\/compiler\/forget\/src\/HIR\/ValidateConsistentIdentifiers.ts\nindex 0ad9988a51..52bff620af 100644\n--- a\/compiler\/forget\/src\/HIR\/ValidateConsistentIdentifiers.ts\n+++ b\/compiler\/forget\/src\/HIR\/ValidateConsistentIdentifiers.ts\n@@ -29,17 +29,13 @@ export function validateConsistentIdentifiers(fn: HIRFunction): void {\n }\n }\n for (const instr of block.instructions) {\n- if (instr.lvalue.place.identifier.name !== null) {\n+ if (instr.lvalue.identifier.name !== null) {\n CompilerError.invariant(\n- `Expected all lvalues to be temporaries, found '${instr.lvalue.place.identifier.name}'`,\n- instr.lvalue.place.loc\n+ `Expected all lvalues to be temporaries, found '${instr.lvalue.identifier.name}'`,\n+ instr.lvalue.loc\n );\n }\n- validate(\n- identifiers,\n- instr.lvalue.place.identifier,\n- instr.lvalue.place.loc\n- );\n+ validate(identifiers, instr.lvalue.identifier, instr.lvalue.loc);\n for (const operand of eachInstructionValueOperand(instr.value)) {\n validate(identifiers, operand.identifier, operand.loc);\n }\ndiff --git a\/compiler\/forget\/src\/HIR\/visitors.ts b\/compiler\/forget\/src\/HIR\/visitors.ts\nindex 85285b60d5..5c62a2f080 100644\n--- a\/compiler\/forget\/src\/HIR\/visitors.ts\n+++ b\/compiler\/forget\/src\/HIR\/visitors.ts\n@@ -594,7 +594,7 @@ export function* eachBlockOperand(block: BasicBlock): Iterable {\n for (const instr of block.instructions) {\n yield* eachInstructionOperand(instr);\n if (instr.lvalue != null) {\n- yield instr.lvalue.place;\n+ yield instr.lvalue;\n }\n }\n yield* eachTerminalOperand(block.terminal);\ndiff --git a\/compiler\/forget\/src\/Inference\/AnalyseFunctions.ts b\/compiler\/forget\/src\/Inference\/AnalyseFunctions.ts\nindex 12678f49e6..9990f8a8ee 100644\n--- a\/compiler\/forget\/src\/Inference\/AnalyseFunctions.ts\n+++ b\/compiler\/forget\/src\/Inference\/AnalyseFunctions.ts\n@@ -56,15 +56,15 @@ export default function analyseFunctions(func: HIRFunction) {\n }\n case \"PropertyLoad\": {\n state.declareProperty(\n- instr.lvalue.place,\n+ instr.lvalue,\n instr.value.object,\n instr.value.property\n );\n break;\n }\n case \"LoadLocal\": {\n- if (instr.lvalue.place.identifier.name === null) {\n- state.declareTemporary(instr.lvalue.place, instr.value.place);\n+ if (instr.lvalue.identifier.name === null) {\n+ state.declareTemporary(instr.lvalue, instr.value.place);\n }\n break;\n }\ndiff --git a\/compiler\/forget\/src\/Inference\/InferAlias.ts b\/compiler\/forget\/src\/Inference\/InferAlias.ts\nindex e4f057fca5..9aacaeb94a 100644\n--- a\/compiler\/forget\/src\/Inference\/InferAlias.ts\n+++ b\/compiler\/forget\/src\/Inference\/InferAlias.ts\n@@ -49,5 +49,5 @@ function inferInstr(instr: Instruction, aliases: DisjointSet) {\n return;\n }\n \n- aliases.union([lvalue.place.identifier, alias.identifier]);\n+ aliases.union([lvalue.identifier, alias.identifier]);\n }\ndiff --git a\/compiler\/forget\/src\/Inference\/InferAliasForStores.ts b\/compiler\/forget\/src\/Inference\/InferAliasForStores.ts\nindex 79c40bcb73..6aa9e44f99 100644\n--- a\/compiler\/forget\/src\/Inference\/InferAliasForStores.ts\n+++ b\/compiler\/forget\/src\/Inference\/InferAliasForStores.ts\n@@ -21,7 +21,7 @@ export function inferAliasForStores(\n for (const [_, block] of func.body.blocks) {\n for (const instr of block.instructions) {\n const { value, lvalue } = instr;\n- if (lvalue.place.effect !== Effect.Store) {\n+ if (lvalue.effect !== Effect.Store) {\n continue;\n }\n if (value.kind === \"StoreLocal\") {\n@@ -32,7 +32,7 @@ export function inferAliasForStores(\n operand.effect === Effect.Capture ||\n operand.effect === Effect.Store\n ) {\n- maybeAlias(aliases, lvalue.place, operand, instr.id);\n+ maybeAlias(aliases, lvalue, operand, instr.id);\n }\n }\n }\ndiff --git a\/compiler\/forget\/src\/Inference\/InferMutableLifetimes.ts b\/compiler\/forget\/src\/Inference\/InferMutableLifetimes.ts\nindex f7373a51e6..eb52f7d2b0 100644\n--- a\/compiler\/forget\/src\/Inference\/InferMutableLifetimes.ts\n+++ b\/compiler\/forget\/src\/Inference\/InferMutableLifetimes.ts\n@@ -129,7 +129,7 @@ export function inferMutableLifetimes(\n }\n }\n \n- const lvalueId = instr.lvalue.place.identifier;\n+ const lvalueId = instr.lvalue.identifier;\n \n \/\/ lvalue start being mutable when they're initially assigned a\n \/\/ value.\ndiff --git a\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts b\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\nindex 785883e99d..f289e31d46 100644\n--- a\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\n+++ b\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\n@@ -655,8 +655,8 @@ function inferBlock(\n );\n }\n state.initialize(instrValue, ValueKind.Mutable);\n- state.define(instr.lvalue.place, instrValue);\n- instr.lvalue.place.effect = Effect.Store;\n+ state.define(instr.lvalue, instrValue);\n+ instr.lvalue.effect = Effect.Store;\n continue;\n }\n case \"PropertyCall\": {\n@@ -676,8 +676,8 @@ function inferBlock(\n state.reference(arg, Effect.Mutate);\n }\n state.initialize(instrValue, ValueKind.Mutable);\n- state.define(instr.lvalue.place, instrValue);\n- instr.lvalue.place.effect = Effect.Mutate;\n+ state.define(instr.lvalue, instrValue);\n+ instr.lvalue.effect = Effect.Mutate;\n continue;\n }\n case \"ComputedCall\": {\n@@ -698,8 +698,8 @@ function inferBlock(\n state.reference(arg, Effect.Mutate);\n }\n state.initialize(instrValue, ValueKind.Mutable);\n- state.define(instr.lvalue.place, instrValue);\n- instr.lvalue.place.effect = Effect.Mutate;\n+ state.define(instr.lvalue, instrValue);\n+ instr.lvalue.effect = Effect.Mutate;\n continue;\n }\n case \"PropertyStore\": {\n@@ -711,8 +711,8 @@ function inferBlock(\n state.reference(instrValue.object, Effect.Store);\n \n const lvalue = instr.lvalue;\n- state.alias(lvalue.place, instrValue.value);\n- lvalue.place.effect = Effect.Store;\n+ state.alias(lvalue, instrValue.value);\n+ lvalue.effect = Effect.Store;\n continue;\n }\n case \"PropertyLoad\": {\n@@ -729,9 +729,9 @@ function inferBlock(\n \n state.reference(instrValue.object, Effect.Read);\n const lvalue = instr.lvalue;\n- lvalue.place.effect = Effect.Mutate;\n+ lvalue.effect = Effect.Mutate;\n state.initialize(instrValue, state.kind(instrValue.object));\n- state.define(lvalue.place, instrValue);\n+ state.define(lvalue, instrValue);\n continue;\n }\n case \"ComputedStore\": {\n@@ -744,8 +744,8 @@ function inferBlock(\n state.reference(instrValue.object, Effect.Store);\n \n const lvalue = instr.lvalue;\n- state.alias(lvalue.place, instrValue.value);\n- lvalue.place.effect = Effect.Store;\n+ state.alias(lvalue, instrValue.value);\n+ lvalue.effect = Effect.Store;\n continue;\n }\n case \"ComputedLoad\": {\n@@ -763,9 +763,9 @@ function inferBlock(\n state.reference(instrValue.object, Effect.Read);\n state.reference(instrValue.property, Effect.Read);\n const lvalue = instr.lvalue;\n- lvalue.place.effect = Effect.Mutate;\n+ lvalue.effect = Effect.Mutate;\n state.initialize(instrValue, state.kind(instrValue.object));\n- state.define(lvalue.place, instrValue);\n+ state.define(lvalue, instrValue);\n continue;\n }\n case \"TypeCastExpression\": {\n@@ -778,16 +778,16 @@ function inferBlock(\n state.initialize(instrValue, state.kind(instrValue.value));\n state.reference(instrValue.value, Effect.Read);\n const lvalue = instr.lvalue;\n- lvalue.place.effect = Effect.Mutate;\n- state.alias(lvalue.place, instrValue.value);\n+ lvalue.effect = Effect.Mutate;\n+ state.alias(lvalue, instrValue.value);\n continue;\n }\n case \"LoadLocal\": {\n state.reference(instrValue.place, Effect.Capture);\n const lvalue = instr.lvalue;\n- lvalue.place.effect = Effect.Mutate;\n+ lvalue.effect = Effect.Mutate;\n \/\/ direct aliasing: `a = b`;\n- state.alias(lvalue.place, instrValue.place);\n+ state.alias(lvalue, instrValue.place);\n continue;\n }\n case \"StoreLocal\": {\n@@ -799,8 +799,8 @@ function inferBlock(\n state.reference(instrValue.value, effect);\n \n const lvalue = instr.lvalue;\n- state.alias(lvalue.place, instrValue.value);\n- lvalue.place.effect = Effect.Store;\n+ state.alias(lvalue, instrValue.value);\n+ lvalue.effect = Effect.Store;\n state.alias(instrValue.lvalue.place, instrValue.value);\n instrValue.lvalue.place.effect = Effect.Store;\n continue;\n@@ -820,8 +820,8 @@ function inferBlock(\n }\n \n state.initialize(instrValue, valueKind);\n- state.define(instr.lvalue.place, instrValue);\n- instr.lvalue.place.effect = lvalueEffect;\n+ state.define(instr.lvalue, instrValue);\n+ instr.lvalue.effect = lvalueEffect;\n }\n \n const effect =\ndiff --git a\/compiler\/forget\/src\/Optimization\/ConstantPropagation.ts b\/compiler\/forget\/src\/Optimization\/ConstantPropagation.ts\nindex 6a7ca792f0..66dffffa37 100644\n--- a\/compiler\/forget\/src\/Optimization\/ConstantPropagation.ts\n+++ b\/compiler\/forget\/src\/Optimization\/ConstantPropagation.ts\n@@ -105,7 +105,7 @@ function applyConstantPropagation(fn: HIRFunction): boolean {\n const value = evaluateInstruction(constants, instr);\n if (value !== null) {\n instr.value = value;\n- constants.set(instr.lvalue.place.identifier.id, value);\n+ constants.set(instr.lvalue.identifier.id, value);\n }\n }\n \ndiff --git a\/compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts b\/compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts\nindex 4036a6c1cc..79210ba6b0 100644\n--- a\/compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts\n+++ b\/compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts\n@@ -39,14 +39,14 @@ export function deadCodeElimination(fn: HIRFunction): void {\n for (let i = block.instructions.length - 1; i >= 0; i--) {\n const instr = block.instructions[i]!;\n if (\n- !used.has(instr.lvalue.place.identifier) &&\n+ !used.has(instr.lvalue.identifier) &&\n pruneableValue(instr.value, used) &&\n \/\/ Can't prune the last value of a value block, that's its value!\n !(block.kind !== \"block\" && i === block.instructions.length - 1)\n ) {\n continue;\n }\n- used.add(instr.lvalue.place.identifier);\n+ used.add(instr.lvalue.identifier);\n for (const operand of eachInstructionValueOperand(instr.value)) {\n used.add(operand.identifier);\n }\n@@ -67,7 +67,7 @@ export function deadCodeElimination(fn: HIRFunction): void {\n }\n }\n retainWhere(block.instructions, (instr) =>\n- used.has(instr.lvalue.place.identifier)\n+ used.has(instr.lvalue.identifier)\n );\n }\n }\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/AlignReactiveScopesToBlockScopes.ts b\/compiler\/forget\/src\/ReactiveScopes\/AlignReactiveScopesToBlockScopes.ts\nindex a779c75961..8cf556aaf5 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/AlignReactiveScopesToBlockScopes.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/AlignReactiveScopesToBlockScopes.ts\n@@ -7,7 +7,6 @@\n \n import {\n InstructionId,\n- LValue,\n Place,\n ReactiveBlock,\n ReactiveFunction,\n@@ -74,12 +73,8 @@ class Visitor extends ReactiveFunctionVisitor {\n state.visitScope(scope);\n }\n }\n- override visitLValue(\n- id: InstructionId,\n- lvalue: LValue,\n- state: Context\n- ): void {\n- const scope = getPlaceScope(id, lvalue.place);\n+ override visitLValue(id: InstructionId, lvalue: Place, state: Context): void {\n+ const scope = getPlaceScope(id, lvalue);\n if (scope !== null) {\n state.visitScope(scope);\n }\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/BuildReactiveBlocks.ts b\/compiler\/forget\/src\/ReactiveScopes\/BuildReactiveBlocks.ts\nindex 1690e4065e..07e3c6d41a 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/BuildReactiveBlocks.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/BuildReactiveBlocks.ts\n@@ -188,7 +188,7 @@ export function getInstructionScope({\n \"Expected lvalues to not be null when assigning scopes. \" +\n \"Pruning lvalues too early can result in missing scope information.\"\n );\n- const lvalueScope = getPlaceScope(id, lvalue.place);\n+ const lvalueScope = getPlaceScope(id, lvalue);\n if (lvalueScope !== null) {\n return lvalueScope;\n }\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/BuildReactiveFunction.ts b\/compiler\/forget\/src\/ReactiveScopes\/BuildReactiveFunction.ts\nindex 28bcf0d542..4dc5f48356 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/BuildReactiveFunction.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/BuildReactiveFunction.ts\n@@ -18,7 +18,6 @@ import {\n } from \"..\/HIR\";\n import {\n HIRFunction,\n- InstructionKind,\n ReactiveBreakTerminal,\n ReactiveContinueTerminal,\n ReactiveFunction,\n@@ -471,7 +470,7 @@ class Driver {\n kind: \"instruction\",\n instruction: {\n id: terminal.id,\n- lvalue: { kind: InstructionKind.Const, place },\n+ lvalue: place,\n value,\n loc: terminal.loc,\n },\n@@ -544,7 +543,7 @@ class Driver {\n const instr = defaultBlock.instructions[0]!;\n return {\n block: defaultBlock.id,\n- place: instr.lvalue!.place,\n+ place: instr.lvalue!,\n value: instr.value,\n id: instr.id,\n };\n@@ -559,7 +558,7 @@ class Driver {\n };\n return {\n block: defaultBlock.id,\n- place: instr.lvalue!.place,\n+ place: instr.lvalue!,\n value: sequence,\n id: instr.id,\n };\n@@ -578,7 +577,7 @@ class Driver {\n {\n id: init.id,\n loc,\n- lvalue: { kind: InstructionKind.Const, place: init.place },\n+ lvalue: init.place,\n value: init.value,\n },\n ],\n@@ -621,7 +620,7 @@ class Driver {\n {\n id: test.id,\n loc: terminal.loc,\n- lvalue: { kind: InstructionKind.Const, place: test.place },\n+ lvalue: test.place,\n value: test.value,\n },\n ],\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts b\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\nindex e8eddd0509..150c56ff52 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\n@@ -488,38 +488,27 @@ function codegenInstruction(\n if (instr.lvalue === null) {\n return t.expressionStatement(value);\n }\n- if (instr.lvalue.place.identifier.name === null) {\n+ if (instr.lvalue.identifier.name === null) {\n \/\/ temporary\n- cx.temp.set(instr.lvalue.place.identifier.id, value);\n+ cx.temp.set(instr.lvalue.identifier.id, value);\n return t.emptyStatement();\n } else {\n- if (instr.lvalue.kind !== InstructionKind.Const) {\n- CompilerError.invariant(\n- `Expected all instruction lvalues to be const declarations`,\n- instr.lvalue.place.loc\n- );\n- }\n- const kind = cx.hasDeclared(instr.lvalue.place.identifier)\n+ const kind = cx.hasDeclared(instr.lvalue.identifier)\n ? InstructionKind.Reassign\n- : instr.lvalue.kind;\n- switch (kind) {\n- case InstructionKind.Const: {\n- return createVariableDeclaration(instr.loc, \"const\", [\n- t.variableDeclarator(codegenLVal(instr.lvalue), value),\n- ]);\n- }\n- case InstructionKind.Reassign: {\n- return createExpressionStatement(\n- instr.loc,\n- t.assignmentExpression(\"=\", codegenLVal(instr.lvalue), value)\n- );\n- }\n- default: {\n- assertExhaustive(\n- kind,\n- `Unexpected instruction kind '${instr.lvalue.kind}'`\n- );\n- }\n+ : InstructionKind.Const;\n+ if (cx.hasDeclared(instr.lvalue.identifier)) {\n+ return createExpressionStatement(\n+ instr.loc,\n+ t.assignmentExpression(\n+ \"=\",\n+ convertIdentifier(instr.lvalue.identifier),\n+ value\n+ )\n+ );\n+ } else {\n+ return createVariableDeclaration(instr.loc, \"const\", [\n+ t.variableDeclarator(convertIdentifier(instr.lvalue.identifier), value),\n+ ]);\n }\n }\n }\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveIdentifiers.ts b\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveIdentifiers.ts\nindex f886032234..d2f9a49401 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveIdentifiers.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveIdentifiers.ts\n@@ -63,7 +63,7 @@ class Visitor extends ReactiveFunctionVisitor {\n \/\/ allow treating safe hooks as non-reactive.\n hasReactiveInput = true;\n }\n- state.reactivityMap.set(lval.place.identifier.id, hasReactiveInput);\n+ state.reactivityMap.set(lval.identifier.id, hasReactiveInput);\n \n if (hasReactiveInput) {\n \/\/ all mutating effects must also be marked as reactive\n@@ -98,7 +98,7 @@ class Visitor extends ReactiveFunctionVisitor {\n if (instr.lvalue !== null) {\n if (instr.value.kind === \"LoadLocal\") {\n state.temporaries.set(\n- instr.lvalue.place.identifier.id,\n+ instr.lvalue.identifier.id,\n instr.value.place.identifier.id\n );\n }\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts b\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts\nindex bbee09a376..68bc5d93c0 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts\n@@ -98,9 +98,9 @@ export function inferReactiveScopeVariables(fn: HIRFunction): void {\n \n for (const instr of block.instructions) {\n const operands: Array = [];\n- const range = instr.lvalue.place.identifier.mutableRange;\n+ const range = instr.lvalue.identifier.mutableRange;\n if (range.end > range.start + 1 || mayAllocate(instr.value)) {\n- operands.push(instr.lvalue!.place.identifier);\n+ operands.push(instr.lvalue!.identifier);\n }\n if (instr.value.kind === \"StoreLocal\") {\n if (\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/MergeOverlappingReactiveScopes.ts b\/compiler\/forget\/src\/ReactiveScopes\/MergeOverlappingReactiveScopes.ts\nindex f44596c720..dfb9209c9f 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/MergeOverlappingReactiveScopes.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/MergeOverlappingReactiveScopes.ts\n@@ -7,7 +7,6 @@\n \n import {\n InstructionId,\n- LValue,\n makeInstructionId,\n Place,\n ReactiveBlock,\n@@ -113,12 +112,8 @@ class Visitor extends ReactiveFunctionVisitor {\n override visitPlace(id: InstructionId, place: Place, state: Context): void {\n state.visitPlace(id, place);\n }\n- override visitLValue(\n- id: InstructionId,\n- lvalue: LValue,\n- state: Context\n- ): void {\n- state.visitPlace(id, lvalue.place);\n+ override visitLValue(id: InstructionId, lvalue: Place, state: Context): void {\n+ state.visitPlace(id, lvalue);\n }\n override visitBlock(block: ReactiveBlock, state: Context): void {\n state.enter(() => {\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/PrintReactiveFunction.ts b\/compiler\/forget\/src\/ReactiveScopes\/PrintReactiveFunction.ts\nindex d73945d0fd..74fad09b1e 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/PrintReactiveFunction.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/PrintReactiveFunction.ts\n@@ -17,7 +17,6 @@ import {\n import {\n printIdentifier,\n printInstructionValue,\n- printLValue,\n printPlace,\n } from \"..\/HIR\/PrintHIR\";\n import { assertExhaustive } from \"..\/Utils\/utils\";\n@@ -85,7 +84,9 @@ function printReactiveInstruction(\n const id = `[${instruction.id}]`;\n \n if (instruction.lvalue !== null) {\n- writer.write(`${id} ${printLValue(instruction.lvalue)} = `);\n+ writer.write(\n+ `${id} ${printIdentifier(instruction.lvalue.identifier)} = `\n+ );\n printReactiveValue(writer, instruction.value);\n writer.newline();\n } else {\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts b\/compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts\nindex 9c91b5ea2d..9468224522 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/PromoteUsedTemporaries.ts\n@@ -56,10 +56,10 @@ class Visitor extends ReactiveFunctionVisitor {\n this.traverseInstruction(instruction, state);\n if (\n instruction.lvalue !== null &&\n- instruction.lvalue.place.identifier.name === null &&\n+ instruction.lvalue.identifier.name === null &&\n instruction.value.kind !== \"LoadLocal\"\n ) {\n- state.temporaries.set(instruction.lvalue.place.identifier, 0);\n+ state.temporaries.set(instruction.lvalue.identifier, 0);\n }\n }\n }\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts b\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts\nindex 813b65c7d2..135617af57 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts\n@@ -11,7 +11,6 @@ import {\n IdentifierId,\n InstructionId,\n InstructionKind,\n- LValue,\n makeInstructionId,\n Place,\n ReactiveBlock,\n@@ -680,20 +679,20 @@ function visitInstructionValue(\n context: Context,\n id: InstructionId,\n value: ReactiveValue,\n- lvalue: LValue | null\n+ lvalue: Place | null\n ): void {\n if (value.kind === \"LoadLocal\" && lvalue !== null) {\n if (\n value.place.identifier.name !== null &&\n- lvalue.place.identifier.name === null\n+ lvalue.identifier.name === null\n ) {\n- context.declareTemporary(lvalue.place, value.place);\n+ context.declareTemporary(lvalue, value.place);\n } else {\n context.visitOperand(value.place);\n }\n } else if (value.kind === \"PropertyLoad\") {\n if (lvalue !== null) {\n- context.declareProperty(lvalue.place, value.object, value.property);\n+ context.declareProperty(lvalue, value.object, value.property);\n } else {\n context.visitProperty(value.object, value.property);\n }\n@@ -717,7 +716,7 @@ function visitInstruction(context: Context, instr: ReactiveInstruction): void {\n if (lvalue == null) {\n return;\n }\n- context.declare(lvalue.place.identifier, {\n+ context.declare(lvalue.identifier, {\n id: instr.id,\n scope: context.currentScope,\n });\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/PruneTemporaryLValues.ts b\/compiler\/forget\/src\/ReactiveScopes\/PruneTemporaryLValues.ts\nindex fb7b1749e6..965d455c4b 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/PruneTemporaryLValues.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/PruneTemporaryLValues.ts\n@@ -8,7 +8,6 @@\n import {\n Identifier,\n InstructionId,\n- InstructionKind,\n Place,\n ReactiveFunction,\n ReactiveInstruction,\n@@ -40,10 +39,9 @@ class Visitor extends ReactiveFunctionVisitor {\n this.traverseInstruction(instruction, state);\n if (\n instruction.lvalue !== null &&\n- instruction.lvalue.kind === InstructionKind.Const &&\n- instruction.lvalue.place.identifier.name === null\n+ instruction.lvalue.identifier.name === null\n ) {\n- state.set(instruction.lvalue.place.identifier, instruction);\n+ state.set(instruction.lvalue.identifier, instruction);\n }\n }\n }\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/RenameVariables.ts b\/compiler\/forget\/src\/ReactiveScopes\/RenameVariables.ts\nindex eddd274034..0109098372 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/RenameVariables.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/RenameVariables.ts\n@@ -60,7 +60,7 @@ class Visitor extends ReactiveFunctionVisitor {\n state.visit(operand.identifier);\n }\n if (instruction.lvalue !== null) {\n- state.visit(instruction.lvalue.place.identifier);\n+ state.visit(instruction.lvalue.identifier);\n }\n }\n override visitScope(scope: ReactiveScopeBlock, state: Scopes): void {\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/visitors.ts b\/compiler\/forget\/src\/ReactiveScopes\/visitors.ts\nindex 7ecdf0b1c3..37933a6372 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/visitors.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/visitors.ts\n@@ -7,7 +7,6 @@\n \n import {\n InstructionId,\n- LValue,\n Place,\n ReactiveBlock,\n ReactiveFunction,\n@@ -31,7 +30,7 @@ export function visitReactiveFunction(\n \n export class ReactiveFunctionVisitor {\n visitID(_id: InstructionId, _state: TState): void {}\n- visitLValue(_id: InstructionId, _lvalue: LValue, _state: TState): void {}\n+ visitLValue(_id: InstructionId, _lvalue: Place, _state: TState): void {}\n visitPlace(_id: InstructionId, _place: Place, _state: TState): void {}\n \n visitValue(id: InstructionId, value: ReactiveValue, state: TState): void {\ndiff --git a\/compiler\/forget\/src\/SSA\/EliminateRedundantPhi.ts b\/compiler\/forget\/src\/SSA\/EliminateRedundantPhi.ts\nindex 3565eb94a7..773ca6aae7 100644\n--- a\/compiler\/forget\/src\/SSA\/EliminateRedundantPhi.ts\n+++ b\/compiler\/forget\/src\/SSA\/EliminateRedundantPhi.ts\n@@ -82,7 +82,7 @@ export function eliminateRedundantPhi(fn: HIRFunction) {\n for (const place of eachInstructionOperand(instr)) {\n rewritePlace(place, rewrites);\n }\n- rewritePlace(instr.lvalue.place, rewrites);\n+ rewritePlace(instr.lvalue, rewrites);\n }\n \n \/\/ Rewrite all terminal operands\ndiff --git a\/compiler\/forget\/src\/SSA\/EnterSSA.ts b\/compiler\/forget\/src\/SSA\/EnterSSA.ts\nindex 02a16508af..d34c9e773b 100644\n--- a\/compiler\/forget\/src\/SSA\/EnterSSA.ts\n+++ b\/compiler\/forget\/src\/SSA\/EnterSSA.ts\n@@ -7,7 +7,6 @@ import {\n HIRFunction,\n Identifier,\n IdentifierId,\n- InstructionKind,\n makeInstructionId,\n makeType,\n Phi,\n@@ -215,7 +214,6 @@ export default function enterSSA(func: HIRFunction): void {\n if (instr.value.kind === \"StoreLocal\") {\n const oldPlace = instr.value.lvalue.place;\n const newPlace = builder.definePlace(oldPlace);\n- instr.lvalue.kind = InstructionKind.Const;\n instr.value.lvalue.place = newPlace;\n \n instr.value.value = builder.getPlace(instr.value.value);\n@@ -223,10 +221,9 @@ export default function enterSSA(func: HIRFunction): void {\n mapInstructionOperands(instr, (place) => builder.getPlace(place));\n }\n \n- const oldPlace = instr.lvalue.place;\n+ const oldPlace = instr.lvalue;\n const newPlace = builder.definePlace(oldPlace);\n- instr.lvalue.kind = InstructionKind.Const;\n- instr.lvalue.place = newPlace;\n+ instr.lvalue = newPlace;\n }\n \n mapTerminalOperands(block.terminal, (place) => builder.getPlace(place));\ndiff --git a\/compiler\/forget\/src\/SSA\/LeaveSSA.ts b\/compiler\/forget\/src\/SSA\/LeaveSSA.ts\nindex 223c60664b..f6e1736d08 100644\n--- a\/compiler\/forget\/src\/SSA\/LeaveSSA.ts\n+++ b\/compiler\/forget\/src\/SSA\/LeaveSSA.ts\n@@ -112,17 +112,6 @@ export function leaveSSA(fn: HIRFunction): void {\n \/\/ `let` or `reassign` where possible.\n const { lvalue, value } = instr;\n if (\n- lvalue.kind === InstructionKind.Const &&\n- rewrites.has(lvalue.place.identifier)\n- ) {\n- \/\/ For rewrites, the declaration of the canonical identifier has to be `let`,\n- \/\/ all other assignments are reassignments (which we annotate for codegen\n- \/\/ purposes).\n- lvalue.kind =\n- rewrites.get(lvalue.place.identifier) === lvalue.place.identifier\n- ? InstructionKind.Let\n- : InstructionKind.Reassign;\n- } else if (\n value.kind === \"StoreLocal\" &&\n value.lvalue.place.identifier.name != null\n ) {\n@@ -147,7 +136,7 @@ export function leaveSSA(fn: HIRFunction): void {\n ? InstructionKind.Let\n : InstructionKind.Reassign;\n }\n- rewritePlace(lvalue.place, rewrites, declarations);\n+ rewritePlace(lvalue, rewrites, declarations);\n for (const operand of eachInstructionValueOperand(instr.value)) {\n rewritePlace(operand, rewrites, declarations);\n }\n@@ -260,10 +249,7 @@ export function leaveSSA(fn: HIRFunction): void {\n };\n block.instructions.push({\n id: block.terminal.id,\n- lvalue: {\n- place: { ...initValue, effect: Effect.Mutate },\n- kind: InstructionKind.Const,\n- },\n+ lvalue: { ...initValue, effect: Effect.Mutate },\n value: {\n kind: \"Primitive\",\n \/\/ TODO: consider leaving the variable uninitialized rather than explicitly undefined.\n@@ -295,22 +281,19 @@ export function leaveSSA(fn: HIRFunction): void {\n \/\/ the if) to the phi, so it's safe to reuse the terminal's id.\n id: block.terminal.id,\n lvalue: {\n- place: {\n- kind: \"Identifier\",\n- identifier: {\n- id: fn.env.nextIdentifierId,\n- mutableRange: {\n- start: block.terminal.id,\n- end: makeInstructionId(block.terminal.id + 1),\n- },\n- name: null,\n- scope: null,\n- type: phi.id.type,\n+ kind: \"Identifier\",\n+ identifier: {\n+ id: fn.env.nextIdentifierId,\n+ mutableRange: {\n+ start: block.terminal.id,\n+ end: makeInstructionId(block.terminal.id + 1),\n },\n- effect: Effect.Mutate,\n- loc: GeneratedSource,\n+ name: null,\n+ scope: null,\n+ type: phi.id.type,\n },\n- kind: InstructionKind.Const,\n+ effect: Effect.Mutate,\n+ loc: GeneratedSource,\n },\n value: {\n kind: \"StoreLocal\",\ndiff --git a\/compiler\/forget\/src\/TypeInference\/InferTypes.ts b\/compiler\/forget\/src\/TypeInference\/InferTypes.ts\nindex 1d52f7e21a..6e19bcc5a3 100644\n--- a\/compiler\/forget\/src\/TypeInference\/InferTypes.ts\n+++ b\/compiler\/forget\/src\/TypeInference\/InferTypes.ts\n@@ -54,7 +54,7 @@ function apply(func: HIRFunction, unifier: Unifier) {\n place.identifier.type = unifier.get(place.identifier.type);\n }\n const { lvalue } = instr;\n- lvalue.place.identifier.type = unifier.get(lvalue.place.identifier.type);\n+ lvalue.identifier.type = unifier.get(lvalue.identifier.type);\n }\n }\n }\n@@ -93,7 +93,7 @@ function* generateInstructionTypes(\n instr: Instruction\n ): Generator {\n const { lvalue, value } = instr;\n- const left = lvalue.place.identifier.type;\n+ const left = lvalue.identifier.type;\n \n switch (value.kind) {\n case \"JSXText\":\n","parents":["f4abf0a9ee43daf880bda8bbcd66a0a86e8d6f42"]}

dillon1000/react

Files changed