Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
[Merge chakra-core/ChakraCore@40d6222ef2] [MERGE #3861 @obastemur] js…
Browse files Browse the repository at this point in the history
…rt: JsConvertValueToString exit fast if arg. is JavascriptString

Merge pull request #3861 from obastemur:wayward_giant

Entering into ContextAPIWrapper is expensive. node-chakracore, (epscially acme air app)
majority of the callers triggers this method with JavascriptString.
  • Loading branch information
chakrabot authored and kfarnung committed Jan 9, 2018
1 parent 4bd8e0c commit bf6bd93
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions deps/chakrashim/core/lib/Jsrt/Jsrt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1215,12 +1215,22 @@ CHAKRA_API JsStringToPointer(_In_ JsValueRef stringValue, _Outptr_result_buffer_

CHAKRA_API JsConvertValueToString(_In_ JsValueRef value, _Out_ JsValueRef *result)
{
PARAM_NOT_NULL(result);
*result = nullptr;

if (value != nullptr && Js::JavascriptString::Is(value))
{
return ContextAPINoScriptWrapper_NoRecord([&](Js::ScriptContext *scriptContext) -> JsErrorCode {
VALIDATE_INCOMING_REFERENCE(value, scriptContext);

*result = value;
return JsNoError;
});
}

return ContextAPIWrapper<JSRT_MAYBE_TRUE>([&] (Js::ScriptContext *scriptContext, TTDRecorder& _actionEntryPopper) -> JsErrorCode {
PERFORM_JSRT_TTD_RECORD_ACTION(scriptContext, RecordJsRTVarToStringConversion, (Js::Var)value);

VALIDATE_INCOMING_REFERENCE(value, scriptContext);
PARAM_NOT_NULL(result);
*result = nullptr;

*result = (JsValueRef) Js::JavascriptConversion::ToString((Js::Var)value, scriptContext);

Expand Down

0 comments on commit bf6bd93

Please sign in to comment.