Skip to content

Commit 0051d4a

Browse files
committedJul 25, 2018
[1.10>master] [MERGE #5522 @MikeHolman] fix issue where helper call is reading varargs incorrectly on linux
Merge pull request #5522 from MikeHolman:users/michhol/vararghelperbug Fixes #5503
2 parents d28ff47 + 2451fe4 commit 0051d4a

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed
 

‎lib/Runtime/Language/Arguments.h

+5
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ inline int _count_args(const T1&, const T2&, const T3&, const T4&, Js::CallInfo
6060
{
6161
return 5;
6262
}
63+
template <class T1, class T2, class T3, class T4, class T5>
64+
inline int _count_args(const T1&, const T2&, const T3&, const T4&, const T5&, Js::CallInfo callInfo)
65+
{
66+
return 6;
67+
}
6368
#endif
6469

6570

‎lib/Runtime/Language/ProfilingHelpers.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ using namespace Js;
547547
CallInfo callInfo,
548548
...)
549549
{
550-
ARGUMENTS(args, callInfo);
550+
ARGUMENTS(args, spreadIndices, callee, framePointer, profileId, arrayProfileId, callInfo);
551551

552552
Js::ScriptFunction *function = ScriptFunction::UnsafeFromVar(JavascriptCallStackLayout::FromFramePointer(framePointer)->functionObject);
553553
ScriptContext* scriptContext = function->GetScriptContext();

0 commit comments

Comments
 (0)
Please sign in to comment.