{"files":[{"status":"A","path":"compiler\/forget\/src\/HIR\/ObjectShape.ts"},{"status":"M","path":"compiler\/forget\/src\/HIR\/PrintHIR.ts"},{"status":"M","path":"compiler\/forget\/src\/HIR\/Types.ts"},{"status":"M","path":"compiler\/forget\/src\/TypeInference\/InferTypes.ts"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-array.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-object.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-renaming-ternary-destruction-with-mutation.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-renaming-ternary-destruction.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-renaming-ternary-with-mutation.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-renaming-ternary.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-renaming-unconditional-ternary-with-mutation.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-renaming-unconditional-ternary.expect.md"},{"status":"M","path":"compiler\/forget\/src\/__tests__\/fixtures\/hir\/ssa-renaming-unconditional-with-mutation.expect.md"}],"commit":{"subject":"[wip][typer] Infer Array instance properties","authorName":"Mofei Zhang","revision":"ec345ca538704b25c66879025528e3b0dd1f96a2","shortRevision":"ec345ca538","authorEmail":"mofei.zhang@utexas.edu","authoredAt":"2023-03-21T14:57:11-04:00"},"parents":["ef34ca6cb044bca24890464e52a2e04b1984ba1b"],"body":"--- \n\nTODO: add inference for TypedFunction to `InferReferenceEffects`","patch":"diff --git a\/compiler\/forget\/src\/HIR\/ObjectShape.ts b\/compiler\/forget\/src\/HIR\/ObjectShape.ts\nnew file mode 100644\nindex 0000000000..b0014d964a\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/HIR\/ObjectShape.ts\n@@ -0,0 +1,134 @@\n+\/**\n+ * Copyright (c) Facebook, Inc. and its affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ *\/\n+import invariant from \"invariant\";\n+import { Effect } from \".\/HIR\";\n+import { BuiltInType, FunctionType, PrimitiveType } from \".\/Types\";\n+\n+const PRIMITIVE_TYPE: PrimitiveType = {\n+ kind: \"Primitive\",\n+};\n+\n+let nextAnonId = 0;\n+\/\/ use strings since they are easily debuggable, even though `Symbol()`\n+\/\/ might be more performant\n+function createAnonId(): string {\n+ return ``;\n+}\n+\n+function addFunction(\n+ registry: ShapeRegistry,\n+ properties: Iterable<[string, BuiltInType | null]>,\n+ fn: FunctionSignature\n+): FunctionType {\n+ const shapeId = createAnonId();\n+ addShape(registry, shapeId, properties, fn);\n+ return {\n+ kind: \"Function\",\n+ shapeId,\n+ };\n+}\n+\n+function addShape(\n+ registry: ShapeRegistry,\n+ id: string,\n+ properties: Iterable<[string, BuiltInType | null]>,\n+ functionType?: FunctionSignature\n+): ObjectShape {\n+ const shape: ObjectShape = {\n+ properties: new Map(properties),\n+ functionType: functionType ?? null,\n+ };\n+\n+ invariant(\n+ !registry.has(id),\n+ `[ObjectShape] Could not add shape to registry: name ${id} already exists.`\n+ );\n+ registry.set(id, shape);\n+ return shape;\n+}\n+\n+\/\/ Param type not recorded since it currently does not affect inference.\n+\/\/ Specifically, we currently do not:\n+\/\/ - infer types based on their usage in argument position\n+\/\/ - handle inference for overloaded \/ generic functions\n+export type FunctionSignature = {\n+ positionalParams: Array;\n+ restParam: Effect | null;\n+ returnType: BuiltInType | null;\n+ calleeEffect: Effect;\n+};\n+\n+export type ObjectShape = {\n+ properties: Map;\n+ functionType: FunctionSignature | null;\n+};\n+\n+export type ShapeRegistry = Map;\n+\n+\/**\n+ * Shapes of built-in types\n+ *\/\n+\n+\/\/ The only \"entrypoints\" should be Globals and recursive lookups from properties \/ functions\n+export const BUILTIN_SHAPES: ShapeRegistry = new Map();\n+export const ArrayShapeId = \"Array\";\n+export const ObjectShapeId = \"Object\";\n+\n+\/* Built-in array shape *\/\n+addShape(BUILTIN_SHAPES, ArrayShapeId, [\n+ [\n+ \"at\",\n+ addFunction(BUILTIN_SHAPES, [], {\n+ positionalParams: [Effect.Read],\n+ restParam: null,\n+ returnType: null,\n+ calleeEffect: Effect.Capture,\n+ }),\n+ ],\n+ [\n+ \"concat\",\n+ addFunction(BUILTIN_SHAPES, [], {\n+ positionalParams: [],\n+ restParam: Effect.Capture,\n+ returnType: {\n+ kind: \"Object\",\n+ shapeId: ArrayShapeId,\n+ },\n+ calleeEffect: Effect.Capture,\n+ }),\n+ ],\n+ [\"length\", PRIMITIVE_TYPE],\n+ [\n+ \"push\",\n+ addFunction(BUILTIN_SHAPES, [], {\n+ positionalParams: [],\n+ restParam: Effect.Capture,\n+ returnType: {\n+ kind: \"Primitive\",\n+ },\n+ calleeEffect: Effect.Store,\n+ }),\n+ ],\n+ \/\/ TODO: rest of Array properties\n+]);\n+\n+\/* Built-in Object shape *\/\n+addShape(BUILTIN_SHAPES, ObjectShapeId, [\n+ [\n+ \"toString\",\n+ addFunction(BUILTIN_SHAPES, [], {\n+ positionalParams: [],\n+ restParam: null,\n+ returnType: {\n+ kind: \"Primitive\",\n+ },\n+ calleeEffect: Effect.Read,\n+ }),\n+ ],\n+ \/\/ TODO:\n+ \/\/ hasOwnProperty, isPrototypeOf, propertyIsEnumerable, toLocaleString, valueOf\n+]);\ndiff --git a\/compiler\/forget\/src\/HIR\/PrintHIR.ts b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\nindex a8991a47c4..65821ed1ab 100644\n--- a\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n@@ -566,7 +566,14 @@ function printScope(scope: ReactiveScope | null): string {\n \n function printType(type: Type): string {\n if (type.kind === \"Type\") return \"\";\n- return `:T${type.kind}`;\n+ \/\/ TODO(mofeiZ): add debugName for generated ids\n+ if (type.kind === \"Object\" && type.shapeId != null) {\n+ return `:T${type.kind}<${type.shapeId}>`;\n+ } else if (type.kind === \"Function\" && type.shapeId != null) {\n+ return `:T${type.kind}<${type.shapeId}>`;\n+ } else {\n+ return `:T${type.kind}`;\n+ }\n }\n \n export function printSourceLocation(loc: SourceLocation): string {\ndiff --git a\/compiler\/forget\/src\/HIR\/Types.ts b\/compiler\/forget\/src\/HIR\/Types.ts\nindex 959bb52751..933ef3aa20 100644\n--- a\/compiler\/forget\/src\/HIR\/Types.ts\n+++ b\/compiler\/forget\/src\/HIR\/Types.ts\n@@ -7,23 +7,36 @@\n import invariant from \"invariant\";\n import { Hook } from \".\/Hooks\";\n \n-export type Type =\n- | PrimitiveType\n- | HookType\n- | FunctionType\n- | ObjectType\n- | PhiType\n- | PolyType\n- | TypeVar;\n+export type BuiltInType = PrimitiveType | FunctionType | ObjectType;\n+\n+export type Type = BuiltInType | HookType | PhiType | PolyType | TypeVar;\n export type PrimitiveType = { kind: \"Primitive\" };\n-export type FunctionType = {\n- kind: \"Function\";\n-};\n export type HookType = {\n kind: \"Hook\";\n definition: Hook;\n };\n-export type ObjectType = { kind: \"Object\" };\n+\n+\/**\n+ * An {@link FunctionType} or {@link ObjectType} (also a JS object) may be associated with an\n+ * inferred \"object shape\", i.e. a known property (key -> Type) map. This is\n+ * subtly different from JS language semantics - `shape` represents both\n+ * OwnPropertyDescriptors and properties present in the prototype chain.\n+ *\n+ * In addition, a {@link FunctionType} may be associated with an inferred signature,\n+ *\n+ * If `shapeId` is present, it is a key into the global ShapeRegistry.\n+ *\/\n+\n+export type FunctionType = {\n+ kind: \"Function\";\n+ shapeId: string | null;\n+};\n+\n+export type ObjectType = {\n+ kind: \"Object\";\n+ shapeId: string | null;\n+};\n+\n export type TypeVar = {\n kind: \"Type\";\n id: TypeId;\ndiff --git a\/compiler\/forget\/src\/TypeInference\/InferTypes.ts b\/compiler\/forget\/src\/TypeInference\/InferTypes.ts\nindex 9fad30415c..72b977a4e9 100644\n--- a\/compiler\/forget\/src\/TypeInference\/InferTypes.ts\n+++ b\/compiler\/forget\/src\/TypeInference\/InferTypes.ts\n@@ -9,6 +9,7 @@ import {\n TypeId,\n TypeVar,\n } from \"..\/HIR\/HIR\";\n+import { ArrayShapeId, ObjectShapeId } from \"..\/HIR\/ObjectShape\";\n import { eachInstructionLValue, eachInstructionOperand } from \"..\/HIR\/visitors\";\n \n function isPrimitiveBinaryOp(op: t.BinaryExpression[\"operator\"]): boolean {\n@@ -150,7 +151,7 @@ function* generateInstructionTypes(\n if (hook !== null) {\n type = { kind: \"Hook\", definition: hook };\n } else {\n- type = { kind: \"Function\" };\n+ type = { kind: \"Function\", shapeId: null };\n }\n yield equation(value.callee.identifier.type, type);\n break;\n@@ -158,7 +159,14 @@ function* generateInstructionTypes(\n \n case \"ObjectExpression\": {\n invariant(left !== null, \"invald object expression\");\n- yield equation(left, { kind: \"Object\" });\n+ yield equation(left, { kind: \"Object\", shapeId: ObjectShapeId });\n+ break;\n+ }\n+\n+ case \"ArrayExpression\": {\n+ if (left) {\n+ yield equation(left, { kind: \"Object\", shapeId: ArrayShapeId });\n+ }\n break;\n }\n }\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-array.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-array.expect.md\nindex cfcdf7c01b..d1224dddbc 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-array.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-array.expect.md\n@@ -25,7 +25,7 @@ bb0 (block):\n [9] store $27 = StoreLocal Const mutate y$26 = capture $25\n [10] mutate $28:TPrimitive = LoadLocal read x$21:TPrimitive\n [11] mutate $29 = LoadLocal capture y$26\n- [12] store $30 = Array [read $28:TPrimitive, capture $29]\n- [13] Return freeze $30\n+ [12] store $30:TObject = Array [read $28:TPrimitive, capture $29]\n+ [13] Return freeze $30:TObject\n ```\n \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-object.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-object.expect.md\nindex a8bf278561..73d2ab6693 100644\n--- a\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-object.expect.md\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/hir\/simple-object.expect.md\n@@ -25,7 +25,7 @@ bb0 (block):\n [9] store $27 = StoreLocal Const mutate y$26 = capture $25\n [10] mutate $28:TPrimitive = LoadLocal read x$21:TPrimitive\n [11] mutate $29 = LoadLocal capture y$26\n- [12] store $30:TObject = Object { x: read $28:TPrimitive, y: capture $29 }\n- [13] Return freeze $30:TObject\n+ [12] store $30:TObject

dillon1000/react

Files changed