JIT: (xplat) address CR issues

Jianchun Xu · Jianchun Xu · commit 68e819f2e8bb · 2016-10-03T12:35:50.000-07:00
also merge to latest.
diff --git a/lib/Backend/GlobOpt.cpp b/lib/Backend/GlobOpt.cpp
@@ -4878,7 +4878,7 @@ GlobOpt::OptInstr(IR::Instr *&instr, bool* isInstrRemoved)
     }
 
     // Change LdFld on arrays, strings, and 'arguments' to LdLen when we're accessing the .length field
-    if (instr->GetSrc1() && instr->GetSrc1()->IsSymOpnd() && instr->m_opcode == Js::OpCode::ProfiledLdFld || instr->m_opcode == Js::OpCode::LdFld || instr->m_opcode == Js::OpCode::ScopedLdFld)
+    if ((instr->GetSrc1() && instr->GetSrc1()->IsSymOpnd() && instr->m_opcode == Js::OpCode::ProfiledLdFld) || instr->m_opcode == Js::OpCode::LdFld || instr->m_opcode == Js::OpCode::ScopedLdFld)
     {
         IR::Opnd * opnd = instr->GetSrc1();
         Sym *sym = opnd->AsSymOpnd()->m_sym;
diff --git a/lib/Backend/amd64/LowererMDArch.cpp b/lib/Backend/amd64/LowererMDArch.cpp
@@ -926,29 +926,36 @@ LowererMDArch::LowerCall(IR::Instr * callInstr, uint32 argCount)
 #define _V_ARG_INDEX(index) _vindex[(index) - 1]
 #endif
 
+    // xplat NOTE: Lower often loads "known args" with LoadHelperArgument() and
+    // variadic JS runtime args with LowerCallArgs(). So the full args length is
+    //      this->helperCallArgsCount + argCount
+    // "argCount > 0" indicates we have variadic JS runtime args and needs to
+    // manually home registers on xplat.
+    const bool shouldHomeParams = argCount > 0;
+
     while (argsLeft > 0)
     {
         IR::Opnd * helperSrc = this->helperCallArgs[this->helperCallArgsCount - argsLeft];
         uint16 index = _V_ARG_INDEX(argsLeft);
         StackSym * helperSym = m_func->m_symTable->GetArgSlotSym(index);
         helperSym->m_type = ExtendHelperArg(helperSrc->GetType());
         Lowerer::InsertMove(
-            this->GetArgSlotOpnd(index, helperSym, /*isHelper*/true),
+            this->GetArgSlotOpnd(index, helperSym, /*isHelper*/!shouldHomeParams),
             helperSrc,
             callInstr);
         --argsLeft;
     }
 
 #ifndef _WIN32
     // Manually home args
-    if (argCount > 0)
+    if (shouldHomeParams)
     {
         static const RegNum s_argRegs[IntArgRegsCount] = {
     #define REG_INT_ARG(Index, Name)  Reg ## Name,
     #include "RegList.h"
         };
 
-        const int callArgCount = static_cast<int>(argCount) + this->helperCallArgsCount;
+        const int callArgCount = this->helperCallArgsCount + static_cast<int>(argCount);
         const int argRegs = min(callArgCount, static_cast<int>(IntArgRegsCount));
         for (int i = argRegs - 1; i >= 0; i--)
         {
diff --git a/lib/Runtime/Language/Arguments.h b/lib/Runtime/Language/Arguments.h
@@ -27,13 +27,16 @@
 
 inline Js::Var* _get_va(void* addrOfReturnAddress, int n)
 {
+    // All args are right after ReturnAddress by custom calling convention
     Js::Var* pArgs = reinterpret_cast<Js::Var*>(addrOfReturnAddress) + 1;
     return pArgs + n;
 }
 
 inline int _count_args(Js::CallInfo callInfo)
 {
-    return 2;  // for typical JsMethod with 2 known args "function, callInfo"
+    // This is to support typical runtime "ARGUMENTS(args, callInfo)" usage.
+    // Only "callInfo" listed, but we have 2 known args "function, callInfo".
+    return 2;
 }
 template <class T1>
 inline int _count_args(const T1&, Js::CallInfo callInfo)

Original file line number	Diff line number	Diff line change
`@@ -4878,7 +4878,7 @@ GlobOpt::OptInstr(IR::Instr &instr, bool isInstrRemoved)`
`4878`	`4878`	`}`
`4879`	`4879`
`4880`	`4880`	`// Change LdFld on arrays, strings, and 'arguments' to LdLen when we're accessing the .length field`
`4881`		`- if (instr->GetSrc1() && instr->GetSrc1()->IsSymOpnd() && instr->m_opcode == Js::OpCode::ProfiledLdFld \|\| instr->m_opcode == Js::OpCode::LdFld \|\| instr->m_opcode == Js::OpCode::ScopedLdFld)`
	`4881`	`+ if ((instr->GetSrc1() && instr->GetSrc1()->IsSymOpnd() && instr->m_opcode == Js::OpCode::ProfiledLdFld) \|\| instr->m_opcode == Js::OpCode::LdFld \|\| instr->m_opcode == Js::OpCode::ScopedLdFld)`
`4882`	`4882`	`{`
`4883`	`4883`	`IR::Opnd * opnd = instr->GetSrc1();`
`4884`	`4884`	`Sym *sym = opnd->AsSymOpnd()->m_sym;`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,16 @@`
`27`	`27`
`28`	`28`	`inline Js::Var* _get_va(void* addrOfReturnAddress, int n)`
`29`	`29`	`{`
	`30`	`+ // All args are right after ReturnAddress by custom calling convention`
`30`	`31`	`Js::Var* pArgs = reinterpret_cast<Js::Var*>(addrOfReturnAddress) + 1;`
`31`	`32`	`return pArgs + n;`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`inline int _count_args(Js::CallInfo callInfo)`
`35`	`36`	`{`
`36`		`- return 2; // for typical JsMethod with 2 known args "function, callInfo"`
	`37`	`+ // This is to support typical runtime "ARGUMENTS(args, callInfo)" usage.`
	`38`	`+ // Only "callInfo" listed, but we have 2 known args "function, callInfo".`
	`39`	`+ return 2;`
`37`	`40`	`}`
`38`	`41`	`template <class T1>`
`39`	`42`	`inline int _count_args(const T1&, Js::CallInfo callInfo)`