From 1ed7cb0750624831d03a0ef8fc64e33b8ce3f14f Mon Sep 17 00:00:00 2001 From: Mike Vitousek Date: Tue, 2 Jul 2024 00:41:30 -0700 Subject: [PATCH] [compiler][ez] Rename disableMemoizationForDebugging to just disableMemoization Summary: We don't really need to make positive claims about what a particular mode is for in the name [ghstack-poisoned] --- .../babel-plugin-react-compiler/src/Entrypoint/Pipeline.ts | 2 +- .../babel-plugin-react-compiler/src/HIR/Environment.ts | 2 +- .../src/Inference/DropManualMemoization.ts | 2 +- .../src/ReactiveScopes/CodegenReactiveFunction.ts | 4 ++-- .../fixtures/compiler/nomemo-and-change-detect.expect.md | 4 ++-- .../__tests__/fixtures/compiler/nomemo-and-change-detect.js | 2 +- .../src/__tests__/fixtures/compiler/nomemo-path.expect.md | 4 ++-- .../src/__tests__/fixtures/compiler/nomemo-path.js | 2 +- .../compiler/useMemo-simple-preserved-nomemo.expect.md | 4 ++-- .../fixtures/compiler/useMemo-simple-preserved-nomemo.js | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Pipeline.ts b/compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Pipeline.ts index 5fdbd77675b..4815fa767ad 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Pipeline.ts +++ b/compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Pipeline.ts @@ -270,7 +270,7 @@ function* runWithEnvironment( if ( env.config.enablePreserveExistingManualUseMemo === "scope" || env.config.enableChangeDetection != null || - env.config.disableMemoizationForDebugging + env.config.disableMemoization ) { memoizeExistingUseMemos(hir); yield log({ diff --git a/compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts b/compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts index e74fb4a8c1a..d64a4d9fb56 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts +++ b/compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts @@ -377,7 +377,7 @@ const EnvironmentConfigSchema = z.object({ * @enablePreserveExistingManualUseMemo, because otherwise memoization in the * original source will be disabled as well. */ - disableMemoizationForDebugging: z.boolean().default(false), + disableMemoization: z.boolean().default(false), /** * When true, rather using memoized values, the compiler will always re-compute diff --git a/compiler/packages/babel-plugin-react-compiler/src/Inference/DropManualMemoization.ts b/compiler/packages/babel-plugin-react-compiler/src/Inference/DropManualMemoization.ts index d70b0c0dd18..873df09425e 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/Inference/DropManualMemoization.ts +++ b/compiler/packages/babel-plugin-react-compiler/src/Inference/DropManualMemoization.ts @@ -365,7 +365,7 @@ export function dropManualMemoization(func: HIRFunction): void { const isManualUseMemoEnabled = func.env.config.enablePreserveExistingManualUseMemo === "scope" || func.env.config.enableChangeDetection != null || - func.env.config.disableMemoizationForDebugging; + func.env.config.disableMemoization; const isValidationEnabled = func.env.config.validatePreserveExistingMemoizationGuarantees || func.env.config.enablePreserveExistingMemoizationGuarantees || diff --git a/compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/CodegenReactiveFunction.ts b/compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/CodegenReactiveFunction.ts index d91284384fc..52e0d90dabd 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/CodegenReactiveFunction.ts +++ b/compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/CodegenReactiveFunction.ts @@ -623,7 +623,7 @@ function codegenReactiveScope( } if ( - cx.env.config.disableMemoizationForDebugging && + cx.env.config.disableMemoization && !scope.source && cx.env.config.enableChangeDetection == null ) { @@ -691,7 +691,7 @@ function codegenReactiveScope( t.variableDeclarator(t.identifier(loadNameStr), genSlot()), ]) ); - if (scope.source || !cx.env.config.disableMemoizationForDebugging) { + if (scope.source || !cx.env.config.disableMemoization) { restoreOldValueStatements.push( t.expressionStatement( t.assignmentExpression("=", t.identifier(nameStr), restoredValue) diff --git a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-and-change-detect.expect.md b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-and-change-detect.expect.md index 89c07f55028..c076331d6da 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-and-change-detect.expect.md +++ b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-and-change-detect.expect.md @@ -2,7 +2,7 @@ ## Input ```javascript -// @disableMemoizationForDebugging @enableChangeDetection +// @disableMemoization @enableChangeDetection import { useMemo } from "react"; function Component(props) { @@ -28,7 +28,7 @@ export const FIXTURE_ENTRYPOINT = { ```javascript import { $structuralCheck } from "react-compiler-runtime"; -import { c as _c } from "react/compiler-runtime"; // @disableMemoizationForDebugging @enableChangeDetection +import { c as _c } from "react/compiler-runtime"; // @disableMemoization @enableChangeDetection import { useMemo } from "react"; function Component(props) { diff --git a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-and-change-detect.js b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-and-change-detect.js index 8c53a732c38..7d48bcaf7da 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-and-change-detect.js +++ b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-and-change-detect.js @@ -1,4 +1,4 @@ -// @disableMemoizationForDebugging @enableChangeDetection +// @disableMemoization @enableChangeDetection import { useMemo } from "react"; function Component(props) { diff --git a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-path.expect.md b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-path.expect.md index 9dd98c8cba7..aa5a1466c2c 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-path.expect.md +++ b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-path.expect.md @@ -2,7 +2,7 @@ ## Input ```javascript -// @disableMemoizationForDebugging +// @disableMemoization import { useMemo } from "react"; const w = 42; @@ -23,7 +23,7 @@ export const FIXTURE_ENTRYPOINT = { ## Code ```javascript -import { c as _c } from "react/compiler-runtime"; // @disableMemoizationForDebugging +import { c as _c } from "react/compiler-runtime"; // @disableMemoization import { useMemo } from "react"; const w = 42; diff --git a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-path.js b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-path.js index 34fcb759e1a..1fa2f033efc 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-path.js +++ b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/nomemo-path.js @@ -1,4 +1,4 @@ -// @disableMemoizationForDebugging +// @disableMemoization import { useMemo } from "react"; const w = 42; diff --git a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/useMemo-simple-preserved-nomemo.expect.md b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/useMemo-simple-preserved-nomemo.expect.md index d1c7afdfd05..21af5430051 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/useMemo-simple-preserved-nomemo.expect.md +++ b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/useMemo-simple-preserved-nomemo.expect.md @@ -2,7 +2,7 @@ ## Input ```javascript -// @disableMemoizationForDebugging +// @disableMemoization import { useMemo } from "react"; function Component({ a }) { @@ -21,7 +21,7 @@ export const FIXTURE_ENTRYPOINT = { ## Code ```javascript -import { c as _c } from "react/compiler-runtime"; // @disableMemoizationForDebugging +import { c as _c } from "react/compiler-runtime"; // @disableMemoization import { useMemo } from "react"; function Component(t0) { diff --git a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/useMemo-simple-preserved-nomemo.js b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/useMemo-simple-preserved-nomemo.js index b68649d9283..1520760366b 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/useMemo-simple-preserved-nomemo.js +++ b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/useMemo-simple-preserved-nomemo.js @@ -1,4 +1,4 @@ -// @disableMemoizationForDebugging +// @disableMemoization import { useMemo } from "react"; function Component({ a }) {