{"parents":["855d13f4b23b0af8b7004fd29ac7425e3636ba8a"],"commit":{"authorName":"Jan Kassens","authoredAt":"2022-11-21T15:14:20-05:00","shortRevision":"1228bc8ce5","revision":"1228bc8ce5eadd15a4d25ba373afcb4eef8543be","authorEmail":"jkassens@meta.com","subject":"[codegen] assign some locations in generated code (#802)"},"body":"","files":[{"path":"compiler\/forget\/packages\/playground\/components\/Editor\/HIRTabContent.tsx","status":"M"},{"path":"compiler\/forget\/src\/HIR\/Codegen.ts","status":"M"}],"patch":"diff --git a\/compiler\/forget\/packages\/playground\/components\/Editor\/HIRTabContent.tsx b\/compiler\/forget\/packages\/playground\/components\/Editor\/HIRTabContent.tsx\nindex fcf8350b11..c0f60d7d4f 100644\n--- a\/compiler\/forget\/packages\/playground\/components\/Editor\/HIRTabContent.tsx\n+++ b\/compiler\/forget\/packages\/playground\/components\/Editor\/HIRTabContent.tsx\n@@ -38,7 +38,7 @@ export default function HIRTabContent({ source }: { source: string }) {\n });\n \n return (\n-

\n+

\n {astFunctions.map((func, index): React.ReactNode => {\n let body;\n@@ -61,8 +61,6 @@ export default function HIRTabContent({ source }: { source: string }) {\n \n if (flags.codegen) {\n const ast = codegen(ir);\n- \/\/ TODO: codegen should set this correctly directly\n- ast.loc = func.node.loc;\n const generated = generate(\n ast,\n {\n@@ -100,8 +98,8 @@ export default function HIRTabContent({ source }: { source: string }) {\n }\n const name = func.node.id?.name ?? \"anonymous\";\n return (\n-

\n-

Function: {name}<\/h3>\n+
\n+
Function: {name}<\/h3>\n {body}\n <\/div>\n );\ndiff --git a\/compiler\/forget\/src\/HIR\/Codegen.ts b\/compiler\/forget\/src\/HIR\/Codegen.ts\nindex 716c299522..0fc01752b0 100644\n--- a\/compiler\/forget\/src\/HIR\/Codegen.ts\n+++ b\/compiler\/forget\/src\/HIR\/Codegen.ts\n@@ -9,6 +9,7 @@ import * as t from \"@babel\/types\";\n import { assertExhaustive } from \"..\/Common\/utils\";\n import { invariant } from \"..\/CompilerError\";\n import {\n+ GeneratedSource,\n HIRFunction,\n Identifier,\n IdentifierId,\n@@ -17,10 +18,28 @@ import {\n InstructionValue,\n LValue,\n Place,\n+ SourceLocation,\n } from \".\/HIR\";\n import { BlockTerminal, Visitor, visitTree } from \".\/HIRTreeVisitor\";\n import { todoInvariant } from \".\/todo\";\n \n+function withLoc TNode>(\n+ fn: T\n+): (loc: SourceLocation, ...args: Parameters) => ReturnType {\n+ return (loc: SourceLocation, ...args: Parameters): ReturnType => {\n+ const node = fn(...args);\n+ if (loc != GeneratedSource) {\n+ node.loc = loc;\n+ }\n+ \/\/ @ts-ignore\n+ return node;\n+ };\n+}\n+\n+const createFunctionDeclaration = withLoc(t.functionDeclaration);\n+const createVariableDeclaration = withLoc(t.variableDeclaration);\n+const createAssignmentExpression = withLoc(t.assignmentExpression);\n+\n \/**\n * Converts HIR into Babel nodes, which can then be printed into source text.\n * Note that converting source to HIR and back is not guaranteed to produce\n@@ -46,7 +65,8 @@ export default function codegen(fn: HIRFunction): t.Function {\n const body = visitTree(fn, visitor);\n invariant(t.isBlockStatement(body), \"Expected a block statement\");\n const params = fn.params.map((param) => convertIdentifier(param.identifier));\n- return t.functionDeclaration(\n+ return createFunctionDeclaration(\n+ fn.loc,\n fn.id !== null ? convertIdentifier(fn.id) : null,\n params,\n body,\n@@ -101,13 +121,18 @@ class CodegenVisitor\n ]);\n }\n case InstructionKind.Let: {\n- return t.variableDeclaration(\"let\", [\n+ return createVariableDeclaration(instr.loc, \"let\", [\n t.variableDeclarator(codegenLVal(instr.lvalue), value),\n ]);\n }\n case InstructionKind.Reassign: {\n return t.expressionStatement(\n- t.assignmentExpression(\"=\", codegenLVal(instr.lvalue), value)\n+ createAssignmentExpression(\n+ instr.loc,\n+ \"=\",\n+ codegenLVal(instr.lvalue),\n+ value\n+ )\n );\n }\n default: {\n"}

dillon1000/react

Files changed