Record frozen function names in instrumentation

lib/instrument/visitors/function.js

@@ -87,6 +87,7 @@ function FunctionDeclaration(node, state, parent, key) {
 	if (!binding) {
 		const isTopLevel = block === hoistBlock;
 		binding = createBinding(block, fnName, {isVar: isTopLevel, isFrozenName: true}, state);
+		state.currentFunction?.reservedVarNames.add(fnName);
 
 		// If is a sloppy-mode function declaration which may need to be hoisted, record that.
 		// Determine whether to hoist after 1st pass is complete, once all other bindings created.
@@ -154,6 +155,7 @@ function FunctionExpression(node, state, parent, key) {
 function createAndEnterFunctionOrClassNameBlock(fnName, isSilentConst, state) {
 	const block = createAndEnterBlock(fnName, false, state);
 	createBinding(block, fnName, {isConst: true, isSilentConst, isFrozenName: true}, state);
+	state.currentFunction?.reservedVarNames.add(fnName);
 	return block;
 }
 
@@ -436,6 +438,7 @@ function createFunction(id, node, isStrict, state) {
 		externalVars: new Map(), // Keyed by block
 		scopes: undefined,
 		globalVarNames: new Set(),
+		reservedVarNames: new Set(),
 		amendments: [],
 		superIsProto: false,
 		containsEval: false,
@@ -724,7 +727,7 @@ function insertTrackerComment(fnId, fnType, commentHolderNode, commentType, stat
 function createFunctionInfoFunction(fn, state) {
 	// Compile internal vars and reserved var names
 	const internalVars = Object.create(null),
-		reservedVarNames = new Set();
+		{reservedVarNames} = fn;
 	for (const {name: varName, trails, isFrozenName} of fn.bindings) {
 		if (isFrozenName) {
 			reservedVarNames.add(varName);

lib/serialize/parseFunction.js

@@ -866,12 +866,6 @@ function resolveFunctionInfo(
 		setProp(fnNode, trail, childInfo.ast);
 	});
 
-	// Record function name
-	if (isNestedFunction) {
-		const idNode = fnNode.id;
-		if (idNode) reservedVarNames.add(idNode.name);
-	}
-
 	// Get external var nodes
 	for (const scope of fnInfo.scopes) {
 		const {blockId} = scope;