{"body":"New InstructionValue variant since RegExp literals are valid expressions.","commit":{"shortRevision":"61e97dc278","authorEmail":"joesavona@fb.com","revision":"61e97dc2788558072ca5b01d2abac9ad7fdbda63","subject":"Support RegExp literals","authoredAt":"2023-03-27T10:34:10-07:00","authorName":"Joe Savona"},"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\/PrintHIR.ts"},{"status":"M","path":"compiler\/forget\/src\/HIR\/visitors.ts"},{"status":"M","path":"compiler\/forget\/src\/Inference\/InferReferenceEffects.ts"},{"status":"M","path":"compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts"},{"status":"M","path":"compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts"},{"status":"M","path":"compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts"},{"status":"M","path":"compiler\/forget\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/regexp-literal.expect.md"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/regexp-literal.js"}],"patch":"diff --git a\/compiler\/forget\/src\/HIR\/BuildHIR.ts b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\nindex 7605164c26..87afe579c1 100644\n--- a\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n@@ -1810,6 +1810,15 @@ function lowerExpression(\n loc: exprLoc,\n };\n }\n+ case \"RegExpLiteral\": {\n+ let expr = exprPath as NodePath;\n+ return {\n+ kind: \"RegExpLiteral\",\n+ pattern: expr.node.pattern,\n+ flags: expr.node.flags,\n+ loc: expr.node.loc ?? GeneratedSource,\n+ };\n+ }\n default: {\n builder.errors.push({\n reason: `(BuildHIR::lowerExpression) Handle ${exprPath.type} expressions`,\ndiff --git a\/compiler\/forget\/src\/HIR\/HIR.ts b\/compiler\/forget\/src\/HIR\/HIR.ts\nindex 8d050e6808..678c39471c 100644\n--- a\/compiler\/forget\/src\/HIR\/HIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/HIR.ts\n@@ -565,6 +565,12 @@ export type InstructionValue =\n loc: SourceLocation;\n }\n | { kind: \"JsxFragment\"; children: Array; loc: SourceLocation }\n+ | {\n+ kind: \"RegExpLiteral\";\n+ pattern: string;\n+ flags: string;\n+ loc: SourceLocation;\n+ }\n \n \/\/ store `object.property = value`\n | {\ndiff --git a\/compiler\/forget\/src\/HIR\/PrintHIR.ts b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\nindex e5c92702c9..f4d8e76fbe 100644\n--- a\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/PrintHIR.ts\n@@ -444,6 +444,10 @@ export function printInstructionValue(instrValue: ReactiveValue): string {\n value = `OptionalCall ${printInstructionValue(instrValue.call)}`;\n break;\n }\n+ case \"RegExpLiteral\": {\n+ value = `RegExp \/${instrValue.pattern}\/${instrValue.flags}`;\n+ break;\n+ }\n default: {\n assertExhaustive(\n instrValue,\ndiff --git a\/compiler\/forget\/src\/HIR\/visitors.ts b\/compiler\/forget\/src\/HIR\/visitors.ts\nindex a34acc5083..bca0080d68 100644\n--- a\/compiler\/forget\/src\/HIR\/visitors.ts\n+++ b\/compiler\/forget\/src\/HIR\/visitors.ts\n@@ -170,6 +170,7 @@ export function* eachInstructionValueOperand(\n yield* instrValue.subexprs;\n break;\n }\n+ case \"RegExpLiteral\":\n case \"LoadGlobal\":\n case \"UnsupportedNode\":\n case \"Primitive\":\n@@ -422,6 +423,7 @@ export function mapInstructionOperands(\n instrValue.subexprs = instrValue.subexprs.map(fn);\n break;\n }\n+ case \"RegExpLiteral\":\n case \"LoadGlobal\":\n case \"UnsupportedNode\":\n case \"Primitive\":\ndiff --git a\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts b\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\nindex 51198aac88..fb04c74f79 100644\n--- a\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\n+++ b\/compiler\/forget\/src\/Inference\/InferReferenceEffects.ts\n@@ -666,6 +666,12 @@ function inferBlock(\n effectKind = Effect.Read;\n break;\n }\n+ case \"RegExpLiteral\": {\n+ \/\/ RegExp instances are mutable objects\n+ valueKind = ValueKind.Mutable;\n+ effectKind = Effect.Mutate;\n+ break;\n+ }\n case \"LoadGlobal\":\n case \"JSXText\":\n case \"Primitive\": {\ndiff --git a\/compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts b\/compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts\nindex 1ef41881bb..fe7edaa888 100644\n--- a\/compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts\n+++ b\/compiler\/forget\/src\/Optimization\/DeadCodeElimination.ts\n@@ -207,6 +207,7 @@ function pruneableValue(value: InstructionValue, state: State): boolean {\n \/\/ Potentially safe to prune, since they should just be creating new values\n return false;\n }\n+ case \"RegExpLiteral\":\n case \"LoadGlobal\":\n case \"ArrayExpression\":\n case \"BinaryExpression\":\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts b\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\nindex eda9cdd0f1..27c2263af1 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/CodegenReactiveFunction.ts\n@@ -903,6 +903,10 @@ function codegenInstructionValue(\n value = t.identifier(instrValue.name);\n break;\n }\n+ case \"RegExpLiteral\": {\n+ value = t.regExpLiteral(instrValue.pattern, instrValue.flags);\n+ break;\n+ }\n case \"DeclareLocal\":\n case \"Destructure\":\n case \"StoreLocal\": {\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts b\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts\nindex db107e997b..888cb83499 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/InferReactiveScopeVariables.ts\n@@ -235,6 +235,7 @@ function mayAllocate(value: InstructionValue): boolean {\n case \"Primitive\": {\n return false;\n }\n+ case \"RegExpLiteral\":\n case \"MethodCall\":\n case \"PropertyStore\":\n case \"ComputedStore\":\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts b\/compiler\/forget\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts\nindex 4a9a997ebe..51d81fe8bb 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/PruneNonEscapingScopes.ts\n@@ -509,6 +509,7 @@ function computeMemoizationInputs(\n };\n }\n case \"OptionalCall\":\n+ case \"RegExpLiteral\":\n case \"FunctionExpression\":\n case \"TaggedTemplateExpression\":\n case \"CallExpression\":\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/regexp-literal.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/regexp-literal.expect.md\nnew file mode 100644\nindex 0000000000..c93caa89fb\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/regexp-literal.expect.md\n@@ -0,0 +1,57 @@\n+\n+## Input\n+\n+```javascript\n+function Component(props) {\n+ const pattern = \/foo\/g;\n+ const value = makeValue();\n+ \/\/ We treat RegExp instances as mutable objects (bc they are)\n+ \/\/ so by default we assume this could be mutating `value`:\n+ if (pattern.test(value)) {\n+ return

{value}<\/div>;\n+ }\n+ return

Default<\/div>;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+function Component(props) {\n+ const $ = React.unstable_useMemoCache(4);\n+ let t0;\n+ let value;\n+ if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ const pattern = \/foo\/g;\n+ value = makeValue();\n+\n+ t0 = pattern.test(value);\n+ $[0] = t0;\n+ $[1] = value;\n+ } else {\n+ t0 = $[0];\n+ value = $[1];\n+ }\n+ if (t0) {\n+ let t1;\n+ if ($[2] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ t1 =

{value}<\/div>;\n+ $[2] = t1;\n+ } else {\n+ t1 = $[2];\n+ }\n+ return t1;\n+ }\n+ let t2;\n+ if ($[3] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ t2 =

Default<\/div>;\n+ $[3] = t2;\n+ } else {\n+ t2 = $[3];\n+ }\n+ return t2;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/regexp-literal.js b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/regexp-literal.js\nnew file mode 100644\nindex 0000000000..9b22bb7f95\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/regexp-literal.js\n@@ -0,0 +1,10 @@\n+function Component(props) {\n+ const pattern = \/foo\/g;\n+ const value = makeValue();\n+ \/\/ We treat RegExp instances as mutable objects (bc they are)\n+ \/\/ so by default we assume this could be mutating `value`:\n+ if (pattern.test(value)) {\n+ return

{value}<\/div>;\n+ }\n+ return

Default<\/div>;\n+}\n","parents":["179b24b56e310cf69618653d8d13bbf784ca3939"]}

dillon1000/react

Files changed