@@ -16895,6 +16895,63 @@ const installCorrect = (modules) => {
 					!value.generator))
 		);
 	};
+	/**
+	 * Whether a name read is its class's own name, read in that class's
+	 * heritage or a computed key, where the binding is not yet set.
+	 * @param {Node} self a name read
+	 * @param {CompressorShape} compressor the compressor
+	 * @returns {boolean} true for `x` in `class x { [x] }`
+	 */
+	const readsUnsetClassName = (self, compressor) => {
+		const { definition } = self;
+		if (!definition) return false;
+		let child = compressor.self();
+		let inKey = false;
+		for (let i = 0; ; i++) {
+			const node = compressor.parent(i);
+			if (!node || A.isLambdaNode(node)) return false;
+			if (A.isClassNode(node)) {
+				return (
+					(inKey || child === node.superClass) &&
+					Boolean(node.id) &&
+					node.id.name === self.name &&
+					definition.identifiers.includes(node.id)
+				);
+			}
+			if (node.key === child && node.computed) inKey = true;
+			else if (node.key !== undefined) return false;
+			child = node;
+		}
+	};
+	for (const wrapAnswer of [ast.wrapHasSideEffects, ast.wrapMayThrow]) {
+		wrapAnswer(
+			"Identifier",
+			(
+				/** @type {(self: Node, compressor: CompressorShape) => boolean} */ original
+			) =>
+				(/** @type {Node} */ self, /** @type {CompressorShape} */ compressor) =>
+					original(self, compressor) ||
+					(corrections.enabled &&
+						A.isSymbolRefNode(self) &&
+						readsUnsetClassName(self, compressor))
+		);
+	}
+	ast.wrapDropSideEffectFree(
+		"Identifier",
+		(
+			/** @type {(self: Node, compressor: CompressorShape, firstInStatement?: boolean) => Node | null} */ original
+		) =>
+			(
+				/** @type {Node} */ self,
+				/** @type {CompressorShape} */ compressor,
+				/** @type {boolean=} */ firstInStatement
+			) =>
+				corrections.enabled &&
+				A.isSymbolRefNode(self) &&
+				readsUnsetClassName(self, compressor)
+					? self
+					: original(self, compressor, firstInStatement)
+	);
 	for (const type of ["ClassDeclaration", "ClassExpression"]) {
 		for (const wrapAnswer of [ast.wrapHasSideEffects, ast.wrapMayThrow]) {
 			wrapAnswer(
 
@@ -1389,6 +1389,11 @@ const CORRECTED_CASES = [
 		"function m(v) { v = 2; return arguments[0]; } console.log(m());",
 		{ compress: { arguments: true }, mangle: false }
 	],
+	[
+		"a class's name read in its own computed key, before it is set",
+		"try { class x { [!{ x }]; } new x(); console.log('no error'); } catch (e) { console.log(e.name); }",
+		{ compress: {}, mangle: false }
+	],
 	[
 		"a `const` assigned itself, which throws",
 		"try { const x = 0; x = x; console.log('no error'); } catch (e) { console.log(e.name); }",