{"commit":{"shortRevision":"19cf39f50b","authorName":"Mofei Zhang","authoredAt":"2023-05-22T19:37:50-04:00","subject":"[effects] Track return ValueKind for function signatures","revision":"19cf39f50be3b4742447c8463fbc5af2201b3d5c","authorEmail":"mofei.zhang@utexas.edu"},"patch":"diff --git a\/compiler\/forget\/src\/HIR\/Globals.ts b\/compiler\/forget\/src\/HIR\/Globals.ts\nindex f6d600772f..12e17b0f56 100644\n--- a\/compiler\/forget\/src\/HIR\/Globals.ts\n+++ b\/compiler\/forget\/src\/HIR\/Globals.ts\n@@ -85,6 +85,7 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [\n restParam: null,\n returnType: { kind: \"Primitive\" },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Immutable,\n }),\n ],\n \/\/ https:\/\/tc39.es\/ecma262\/multipage\/indexed-collections.html#sec-array.from\n@@ -104,6 +105,7 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [\n restParam: Effect.Read,\n returnType: { kind: \"Object\", shapeId: BuiltInArrayId },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Mutable,\n }),\n ],\n ]),\n@@ -122,6 +124,7 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [\n restParam: Effect.Read,\n returnType: { kind: \"Primitive\" },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Immutable,\n }),\n ],\n ]),\n@@ -138,6 +141,7 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [\n restParam: Effect.Read,\n returnType: { kind: \"Primitive\" },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Immutable,\n }),\n ],\n [\n@@ -147,6 +151,7 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [\n restParam: Effect.Read,\n returnType: { kind: \"Primitive\" },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Immutable,\n }),\n ],\n [\n@@ -156,6 +161,7 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [\n restParam: Effect.Read,\n returnType: { kind: \"Primitive\" },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Immutable,\n }),\n ],\n [\n@@ -165,6 +171,7 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [\n restParam: Effect.Read,\n returnType: { kind: \"Primitive\" },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Immutable,\n }),\n ],\n [\n@@ -174,6 +181,7 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [\n restParam: Effect.Read,\n returnType: { kind: \"Primitive\" },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Immutable,\n }),\n ],\n [\n@@ -183,6 +191,7 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [\n restParam: Effect.Read,\n returnType: { kind: \"Primitive\" },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Immutable,\n }),\n ],\n ]),\n@@ -194,6 +203,7 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [\n restParam: Effect.Read,\n returnType: { kind: \"Primitive\" },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Immutable,\n }),\n ],\n [\n@@ -203,6 +213,7 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [\n restParam: Effect.Read,\n returnType: { kind: \"Primitive\" },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Immutable,\n }),\n ],\n [\n@@ -212,6 +223,7 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [\n restParam: Effect.Read,\n returnType: { kind: \"Primitive\" },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Immutable,\n }),\n ],\n \/\/ TODO: rest of Global objects\ndiff --git a\/compiler\/forget\/src\/HIR\/ObjectShape.ts b\/compiler\/forget\/src\/HIR\/ObjectShape.ts\nindex 43459357f0..873140f75c 100644\n--- a\/compiler\/forget\/src\/HIR\/ObjectShape.ts\n+++ b\/compiler\/forget\/src\/HIR\/ObjectShape.ts\n@@ -6,7 +6,7 @@\n *\/\n \n import invariant from \"invariant\";\n-import { Effect } from \".\/HIR\";\n+import { Effect, ValueKind } from \".\/HIR\";\n import {\n BuiltInType,\n FunctionType,\n@@ -100,6 +100,7 @@ export type FunctionSignature = {\n positionalParams: Array;\n restParam: Effect | null;\n returnType: BuiltInType | PolyType;\n+ returnValueKind: ValueKind;\n calleeEffect: Effect;\n };\n \n@@ -138,6 +139,7 @@ addObject(BUILTIN_SHAPES, BuiltInArrayId, [\n restParam: null,\n returnType: { kind: \"Poly\" },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Mutable,\n }),\n ],\n [\n@@ -150,6 +152,7 @@ addObject(BUILTIN_SHAPES, BuiltInArrayId, [\n shapeId: BuiltInArrayId,\n },\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Mutable,\n }),\n ],\n [\"length\", PRIMITIVE_TYPE],\n@@ -160,6 +163,7 @@ addObject(BUILTIN_SHAPES, BuiltInArrayId, [\n restParam: Effect.Capture,\n returnType: PRIMITIVE_TYPE,\n calleeEffect: Effect.Store,\n+ returnValueKind: ValueKind.Immutable,\n }),\n ],\n \/\/ TODO: rest of Array properties\n@@ -174,6 +178,7 @@ addObject(BUILTIN_SHAPES, BuiltInObjectId, [\n restParam: null,\n returnType: PRIMITIVE_TYPE,\n calleeEffect: Effect.Read,\n+ returnValueKind: ValueKind.Immutable,\n }),\n ],\n \/\/ TODO:\ndiff --git a\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts b\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\nindex c58b8fe872..edfc37dbc9 100644\n--- a\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\n+++ b\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\n@@ -729,6 +729,8 @@ function inferBlock(\n \n const effects =\n signature !== null ? getFunctionEffects(instrValue, signature) : null;\n+ const returnValueKind =\n+ signature !== null ? signature.returnValueKind : ValueKind.Mutable;\n for (let i = 0; i < instrValue.args.length; i++) {\n const arg = instrValue.args[i];\n const place = arg.kind === \"Identifier\" ? arg : arg.place;\n@@ -749,7 +751,7 @@ function inferBlock(\n state.reference(instrValue.callee, Effect.Mutate);\n }\n \n- state.initialize(instrValue, ValueKind.Mutable);\n+ state.initialize(instrValue, returnValueKind);\n state.define(instr.lvalue, instrValue);\n instr.lvalue.effect = Effect.Mutate;\n continue;\n","body":"","parents":["d456e4a78ccf1cf607a46e802c67eb1442657300"],"files":[{"path":"compiler\/forget\/src\/HIR\/Globals.ts","status":"M"},{"path":"compiler\/forget\/src\/HIR\/ObjectShape.ts","status":"M"},{"path":"compiler\/forget\/src\/Inference\/InferReferenceEffects.ts","status":"M"}]}

dillon1000/react

Files changed