Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

HIR StoreLocal.type uses babel type

Browse Source
This commit is contained in:
Joe Savona
2024-02-05 21:51:09 -08:00
parent 9ec9331def
commit 76aaf32c55
7 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/packages/babel-plugin-react-forget/src/HIR/BuildHIR.ts
+22 -28
View File
@@ -1615,7 +1615,7 @@ function lowerExpression(
kind: "StoreLocal",
lvalue: { kind: InstructionKind.Const, place: { ...place } },
value: last,
type: makeType(),
type: null,
loc: exprLoc,
});
}
@@ -1657,7 +1657,7 @@ function lowerExpression(
kind: "StoreLocal",
lvalue: { kind: InstructionKind.Const, place: { ...place } },
value: consequent,
type: makeType(),
type: null,
loc: exprLoc,
});
return {
@@ -1676,7 +1676,7 @@ function lowerExpression(
kind: "StoreLocal",
lvalue: { kind: InstructionKind.Const, place: { ...place } },
value: alternate,
type: makeType(),
type: null,
loc: exprLoc,
});
return {
@@ -1727,7 +1727,7 @@ function lowerExpression(
kind: "StoreLocal",
lvalue: { kind: InstructionKind.Const, place: { ...place } },
value: { ...leftPlace },
type: makeType(),
type: null,
loc: leftPlace.loc,
});
return {
@@ -1744,7 +1744,7 @@ function lowerExpression(
kind: "StoreLocal",
lvalue: { kind: InstructionKind.Const, place: { ...place } },
value: { ...right },
type: makeType(),
type: null,
loc: right.loc,
});
return {
@@ -1853,7 +1853,7 @@ function lowerExpression(
kind: InstructionKind.Reassign,
},
value: { ...binaryPlace },
type: makeType(),
type: null,
loc: exprLoc,
});
} else {
@@ -2198,7 +2198,7 @@ function lowerExpression(
kind: "TypeCastExpression",
value: lowerExpressionToTemporary(builder, expr.get("expression")),
typeAnnotation: typeAnnotation.node,
type: lowerType(builder, typeAnnotation),
type: lowerType(typeAnnotation.node),
loc: exprLoc,
};
}
@@ -2209,7 +2209,7 @@ function lowerExpression(
kind: "TypeCastExpression",
value: lowerExpressionToTemporary(builder, expr.get("expression")),
typeAnnotation: typeAnnotation.node,
type: lowerType(builder, typeAnnotation),
type: lowerType(typeAnnotation.node),
loc: exprLoc,
};
}
@@ -2315,7 +2315,7 @@ function lowerOptionalMemberExpression(
kind: "StoreLocal",
lvalue: { kind: InstructionKind.Const, place: { ...place } },
value: { ...temp },
type: makeType(),
type: null,
loc,
});
return {
@@ -2370,7 +2370,7 @@ function lowerOptionalMemberExpression(
kind: "StoreLocal",
lvalue: { kind: InstructionKind.Const, place: { ...place } },
value: { ...temp },
type: makeType(),
type: null,
loc,
});
return {
@@ -2427,7 +2427,7 @@ function lowerOptionalCallExpression(
kind: "StoreLocal",
lvalue: { kind: InstructionKind.Const, place: { ...place } },
value: { ...temp },
type: makeType(),
type: null,
loc,
});
return {
@@ -2529,7 +2529,7 @@ function lowerOptionalCallExpression(
kind: "StoreLocal",
lvalue: { kind: InstructionKind.Const, place: { ...place } },
value: { ...temp },
type: makeType(),
type: null,
loc,
});
return {
@@ -3263,15 +3263,15 @@ function lowerAssignment(
});
} else {
const typeAnnotation = lvalue.get("typeAnnotation");
let type: Type;
let type: t.FlowType | t.TSType | null;
if (typeAnnotation.isTSTypeAnnotation()) {
const typePath = typeAnnotation.get("typeAnnotation");
type = lowerType(builder, typePath);
type = typePath.node;
} else if (typeAnnotation.isTypeAnnotation()) {
const typePath = typeAnnotation.get("typeAnnotation");
type = lowerType(builder, typePath);
type = typePath.node;
} else {
type = makeType();
type = null;
}
temporary = lowerValueToTemporary(builder, {
kind: "StoreLocal",
@@ -3584,7 +3584,7 @@ function lowerAssignment(
kind: "StoreLocal",
lvalue: { kind: InstructionKind.Const, place: { ...temp } },
value: { ...defaultValue },
type: makeType(),
type: null,
loc,
});
return {
@@ -3601,7 +3601,7 @@ function lowerAssignment(
kind: "StoreLocal",
lvalue: { kind: InstructionKind.Const, place: { ...temp } },
value: { ...value },
type: makeType(),
type: null,
loc,
});
return {
@@ -3857,23 +3857,17 @@ function notNull<T>(value: T | null): value is T {
return value !== null;
}
function lowerType(
_builder: HIRBuilder,
path: NodePath<t.FlowType | t.TSType>
): Type {
const node = path.node;
export function lowerType(node: t.FlowType | t.TSType): Type {
switch (node.type) {
case "GenericTypeAnnotation": {
const typeAnnotation = path as NodePath<t.GenericTypeAnnotation>;
const id = typeAnnotation.get("id");
if (id.node.type === "Identifier" && id.node.name === "Array") {
const id = node.id;
if (id.type === "Identifier" && id.name === "Array") {
return { kind: "Object", shapeId: BuiltInArrayId };
}
return makeType();
}
case "TSTypeReference": {
const typeReference = path as NodePath<t.TSTypeReference>;
const typeName = typeReference.get("typeName").node;
const typeName = node.typeName;
if (typeName.type === "Identifier" && typeName.name === "Array") {
return { kind: "Object", shapeId: BuiltInArrayId };
}
compiler/packages/babel-plugin-react-forget/src/HIR/HIR.ts
+1 -1
View File
@@ -678,7 +678,7 @@ export type InstructionValue =
kind: "StoreLocal";
lvalue: LValue;
value: Place;
type: Type;
type: t.FlowType | t.TSType | null;
loc: SourceLocation;
}
| {
compiler/packages/babel-plugin-react-forget/src/Inference/InlineImmediatelyInvokedFunctionExpressions.ts
+1 -1
View File
@@ -245,7 +245,7 @@ function rewriteBlock(
kind: "StoreLocal",
lvalue: { kind: InstructionKind.Reassign, place: { ...returnValue } },
value: terminal.value,
type: makeType(),
type: null,
loc: terminal.loc,
},
});
compiler/packages/babel-plugin-react-forget/src/ReactiveScopes/ExtractScopeDeclarationsFromDestructuring.ts
+1 -2
View File
@@ -15,7 +15,6 @@ import {
ReactiveFunction,
ReactiveInstruction,
ReactiveScopeBlock,
makeType,
} from "../HIR";
import { eachPatternOperand, mapPatternOperands } from "../HIR/visitors";
import { ReactiveFunctionTransform, visitReactiveFunction } from "./visitors";
@@ -178,7 +177,7 @@ function transformDestructuring(
place: original,
},
value: temporary,
type: makeType(),
type: null,
loc: destructure.loc,
},
loc: instr.loc,
compiler/packages/babel-plugin-react-forget/src/ReactiveScopes/PropagateEarlyReturns.ts
+2 -3
View File
@@ -16,7 +16,6 @@ import {
ReactiveStatement,
ReactiveTerminalStatement,
makeInstructionId,
makeType,
} from "../HIR";
import { createTemporaryPlace } from "../HIR/HIRBuilder";
import { EARLY_RETURN_SENTINEL } from "./CodegenReactiveFunction";
@@ -221,7 +220,7 @@ class Transform extends ReactiveFunctionTransform<State> {
value: {
kind: "StoreLocal",
loc,
type: makeType(),
type: null,
lvalue: {
kind: InstructionKind.Let,
place: {
@@ -295,7 +294,7 @@ class Transform extends ReactiveFunctionTransform<State> {
value: {
kind: "StoreLocal",
loc,
type: makeType(),
type: null,
lvalue: {
kind: InstructionKind.Reassign,
place: {
compiler/packages/babel-plugin-react-forget/src/ReactiveScopes/PruneHoistedContexts.ts
+1 -2
View File
@@ -11,7 +11,6 @@ import {
ReactiveFunction,
ReactiveInstruction,
ReactiveStatement,
makeType,
} from "../HIR";
import {
ReactiveFunctionTransform,
@@ -60,7 +59,7 @@ class Visitor extends ReactiveFunctionTransform<HoistedIdentifiers> {
...instruction.value.lvalue,
kind: InstructionKind.Const,
},
type: makeType(),
type: null,
kind: "StoreLocal",
},
},
compiler/packages/babel-plugin-react-forget/src/TypeInference/InferTypes.ts
+5 -2
View File
@@ -8,6 +8,7 @@
import * as t from "@babel/types";
import { CompilerError } from "../CompilerError";
import { Environment } from "../HIR";
import { lowerType } from "../HIR/BuildHIR";
import {
HIRFunction,
Instruction,
@@ -142,8 +143,10 @@ function* generateInstructionTypes(
value.lvalue.place.identifier.type,
value.value.identifier.type
);
yield equation(value.type, value.lvalue.place.identifier.type);
yield equation(left, value.type);
const valueType =
value.type === null ? makeType() : lowerType(value.type);
yield equation(valueType, value.lvalue.place.identifier.type);
yield equation(left, valueType);
} else {
yield equation(left, value.value.identifier.type);
yield equation(