Skip to content

inspector: release throw scope before tail-calling impl in injected-script prototype host functions #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jarred-Sumner merged 1 commit into from
Jul 24, 2026
Merged

inspector: release throw scope before tail-calling impl in injected-script prototype host functions #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions Source/JavaScriptCore/inspector/JSInjectedScriptHostPrototype.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeAttributeEvaluate, (JSGlob
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->evaluate(globalObject));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->evaluate(globalObject)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeAttributeSavedResultAlias, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -110,7 +110,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeAttributeSavedResultAlias,
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->savedResultAlias(globalObject));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->savedResultAlias(globalObject)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionInternalConstructorName, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -123,7 +123,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionInternalConstructo
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->internalConstructorName(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->internalConstructorName(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionIsHTMLAllCollection, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -136,7 +136,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionIsHTMLAllCollectio
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->isHTMLAllCollection(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->isHTMLAllCollection(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionIsPromiseRejectedWithNativeGetterTypeError, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -149,7 +149,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionIsPromiseRejectedW
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->isPromiseRejectedWithNativeGetterTypeError(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->isPromiseRejectedWithNativeGetterTypeError(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionProxyTargetValue, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -162,7 +162,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionProxyTargetValue,
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->proxyTargetValue(callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->proxyTargetValue(callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionWeakRefTargetValue, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -175,7 +175,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionWeakRefTargetValue
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->weakRefTargetValue(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->weakRefTargetValue(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionWeakMapSize, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -188,7 +188,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionWeakMapSize, (JSGl
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->weakMapSize(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->weakMapSize(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionWeakMapEntries, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -201,7 +201,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionWeakMapEntries, (J
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->weakMapEntries(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->weakMapEntries(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionWeakSetSize, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -214,7 +214,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionWeakSetSize, (JSGl
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->weakSetSize(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->weakSetSize(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionWeakSetEntries, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -227,7 +227,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionWeakSetEntries, (J
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->weakSetEntries(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->weakSetEntries(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionIteratorEntries, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -240,7 +240,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionIteratorEntries, (
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->iteratorEntries(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->iteratorEntries(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionQueryInstances, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -253,7 +253,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionQueryInstances, (J
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->queryInstances(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->queryInstances(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionQueryHolders, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -266,7 +266,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionQueryHolders, (JSG
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->queryHolders(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->queryHolders(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionEvaluateWithScopeExtension, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -279,7 +279,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionEvaluateWithScopeE
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->evaluateWithScopeExtension(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->evaluateWithScopeExtension(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionSubtype, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -292,7 +292,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionSubtype, (JSGlobal
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->subtype(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->subtype(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionFunctionDetails, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -305,7 +305,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionFunctionDetails, (
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->functionDetails(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->functionDetails(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionGetOwnPrivatePropertySymbols, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -318,7 +318,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionGetOwnPrivatePrope
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->getOwnPrivatePropertySymbols(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->getOwnPrivatePropertySymbols(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionGetOwnPrivatePropertyMethods, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -331,7 +331,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionGetOwnPrivatePrope
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->getOwnPrivatePropertyMethods(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->getOwnPrivatePropertyMethods(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionGetInternalProperties, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -344,7 +344,7 @@ JSC_DEFINE_HOST_FUNCTION(jsInjectedScriptHostPrototypeFunctionGetInternalPropert
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->getInternalProperties(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->getInternalProperties(globalObject, callFrame)));
}

Structure* JSInjectedScriptHostPrototype::createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
Expand Down
22 changes: 11 additions & 11 deletions Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFramePrototypeFunctionEvaluateWithScope
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->evaluateWithScopeExtension(globalObject, callFrame));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->evaluateWithScopeExtension(globalObject, callFrame)));
}

JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFramePrototypeFunctionScopeDescriptions, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -93,7 +93,7 @@ JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFramePrototypeFunctionScopeDescriptions
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->scopeDescriptions(globalObject));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->scopeDescriptions(globalObject)));
}

JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeCaller, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -106,7 +106,7 @@ JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeCaller, (JSGlobalObject*
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->caller(globalObject));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->caller(globalObject)));
}

JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeSourceID, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -119,7 +119,7 @@ JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeSourceID, (JSGlobalObject
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->sourceID(globalObject));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->sourceID(globalObject)));
}

JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeLine, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -132,7 +132,7 @@ JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeLine, (JSGlobalObject* gl
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->line(globalObject));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->line(globalObject)));
}

JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeColumn, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -145,7 +145,7 @@ JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeColumn, (JSGlobalObject*
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->column(globalObject));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->column(globalObject)));
}

JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeFunctionName, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -158,7 +158,7 @@ JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeFunctionName, (JSGlobalOb
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->functionName(globalObject));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->functionName(globalObject)));
}

JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeScopeChain, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -171,7 +171,7 @@ JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeScopeChain, (JSGlobalObje
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->scopeChain(globalObject));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->scopeChain(globalObject)));
}

JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeThisObject, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -184,7 +184,7 @@ JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeThisObject, (JSGlobalObje
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->thisObject(globalObject));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->thisObject(globalObject)));
}

JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeType, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -197,7 +197,7 @@ JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameAttributeType, (JSGlobalObject* gl
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->type(globalObject));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->type(globalObject)));
}

JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameIsTailDeleted, (JSGlobalObject* globalObject, CallFrame* callFrame))
Expand All @@ -210,7 +210,7 @@ JSC_DEFINE_HOST_FUNCTION(jsJavaScriptCallFrameIsTailDeleted, (JSGlobalObject* gl
if (!castedThis)
return throwVMTypeError(globalObject, scope);

return JSValue::encode(castedThis->isTailDeleted(globalObject));
RELEASE_AND_RETURN(scope, JSValue::encode(castedThis->isTailDeleted(globalObject)));
}

Structure* JSJavaScriptCallFramePrototype::createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
Expand Down
Loading