[1.10>master] [MERGE #5522 @MikeHolman] fix issue where helper call i…

…s reading varargs incorrectly on linux Merge pull request #5522 from MikeHolman:users/michhol/vararghelperbug Fixes #5503
chakra-core · Jul 25, 2018 · 0051d4a · 0051d4a
2 parents d28ff47 + 2451fe4
commit 0051d4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/Runtime/Language/Arguments.h b/lib/Runtime/Language/Arguments.h
@@ -60,6 +60,11 @@ inline int _count_args(const T1&, const T2&, const T3&, const T4&, Js::CallInfo
 {
     return 5;
 }
+template <class T1, class T2, class T3, class T4, class T5>
+inline int _count_args(const T1&, const T2&, const T3&, const T4&, const T5&, Js::CallInfo callInfo)
+{
+    return 6;
+}
 #endif
 
 

diff --git a/lib/Runtime/Language/ProfilingHelpers.cpp b/lib/Runtime/Language/ProfilingHelpers.cpp
@@ -547,7 +547,7 @@ using namespace Js;
         CallInfo callInfo,
         ...)
     {
-        ARGUMENTS(args, callInfo);
+        ARGUMENTS(args, spreadIndices, callee, framePointer, profileId, arrayProfileId, callInfo);
 
         Js::ScriptFunction *function = ScriptFunction::UnsafeFromVar(JavascriptCallStackLayout::FromFramePointer(framePointer)->functionObject);
         ScriptContext* scriptContext = function->GetScriptContext();