Some fixes

Author: rajatd

lib/Backend/Inline.cpp

@@ -2844,14 +2844,15 @@ bool Inline::TryGetCallApplyAndTargetLdInstrs(IR::Instr * callInstr, _Outptr_res
     IR::Opnd* applyOpnd = callInstr->GetSrc1();
     Assert(applyOpnd->IsRegOpnd());
     StackSym* applySym =  applyOpnd->AsRegOpnd()->m_sym->AsStackSym();
-    if (!applySym->IsSingleDef())
+    if (!applySym->IsSingleDef() ||
+        !applySym->GetInstrDef()->GetSrc1()->IsSymOpnd() || 
+        !applySym->GetInstrDef()->GetSrc1()->AsSymOpnd()->IsPropertySymOpnd())
     {
         *applyLdInstr = nullptr;
         *applyTargetLdInstr = nullptr;
         return false;
     }
 
-    Assert(applySym->GetInstrDef()->GetSrc1()->IsSymOpnd() && applySym->GetInstrDef()->GetSrc1()->AsSymOpnd()->IsPropertySymOpnd());
     StackSym * targetSym = applySym->GetInstrDef()->GetSrc1()->AsSymOpnd()->AsPropertySymOpnd()->GetObjectSym();
     if (!targetSym->IsSingleDef())
     {

lib/Backend/JITTimeFunctionBody.cpp

@@ -252,7 +252,12 @@ JITTimeFunctionBody::InitializeJITFunctionData(
         jitBody->functionSlotsInCachedScopeCount = slotIdInCachedScopeToNestedIndexArray->count;
         jitBody->slotIdInCachedScopeToNestedIndexArray = slotIdInCachedScopeToNestedIndexArray->elements;
     }
-    jitBody->callSiteToCallApplyCallSiteArray = functionBody->GetCallSiteToCallApplyCallSiteArrayWithLock();
+    Js::ProfileId * callSiteToCallApplyCallSiteArray = functionBody->GetCallSiteToCallApplyCallSiteArrayWithLock();
+    if (callSiteToCallApplyCallSiteArray)
+    {
+        jitBody->callSiteToCallApplyCallSiteArrayCount = jitBody->profiledCallSiteCount;
+        jitBody->callSiteToCallApplyCallSiteArray = callSiteToCallApplyCallSiteArray;
+    }
 #ifdef ASMJS_PLAT
     if (functionBody->GetIsAsmJsFunction())
     {
@@ -1058,8 +1063,12 @@ Js::ProfileId
 JITTimeFunctionBody::GetCallApplyCallSiteIdForCallSiteId(Js::ProfileId callSiteId) const
 {
     AssertOrFailFast(callSiteId < m_bodyData.profiledCallSiteCount);
-    Js::ProfileId callApplyId = m_bodyData.callSiteToCallApplyCallSiteArray[callSiteId];
-    AssertOrFailFast(callApplyId < m_bodyData.profiledCallApplyCallSiteCount);
+    Js::ProfileId callApplyId = Js::Constants::NoProfileId;
+    if (m_bodyData.callSiteToCallApplyCallSiteArray)
+    {
+        callApplyId = m_bodyData.callSiteToCallApplyCallSiteArray[callSiteId];
+        AssertOrFailFast(callApplyId < m_bodyData.profiledCallApplyCallSiteCount);
+    }
 
     return callApplyId;
 }

lib/JITIDL/JITTypes.h

@@ -568,6 +568,7 @@ typedef struct FunctionBodyDataIDL
     unsigned short inParamCount;
     unsigned short argUsedForBranch;
     unsigned short profiledCallSiteCount;
+    unsigned short callSiteToCallApplyCallSiteArrayCount;
     unsigned short profiledCallApplyCallSiteCount;
     unsigned int funcNumber;
     unsigned int sourceContextId;
@@ -634,7 +635,7 @@ typedef struct FunctionBodyDataIDL
 
     IDL_DEF([size_is(functionSlotsInCachedScopeCount)]) unsigned int * slotIdInCachedScopeToNestedIndexArray;
 
-    IDL_DEF([size_is(profiledCallApplyCallSiteCount)]) unsigned short * callSiteToCallApplyCallSiteArray;
+    IDL_DEF([size_is(callSiteToCallApplyCallSiteArrayCount)]) unsigned short * callSiteToCallApplyCallSiteArray;
 
     ProfileDataIDL * profileData;
 

lib/Runtime/Language/DynamicProfileInfo.cpp

@@ -1169,15 +1169,20 @@ namespace Js
         Assert(callSiteId < callSiteCount);
         Assert(functionBody->IsJsBuiltInCode() || functionBody->IsPublicLibraryCode() || HasCallSiteInfo(functionBody));
 
-        Js::ProfileId callApplyCallSiteId = functionBody->GetCallSiteToCallApplyCallSiteArray()[callSiteId];
-        Assert(callApplyCallSiteId < functionBody->GetProfiledCallApplyCallSiteCount());
-        
-        if (callApplyTargetInfo[callApplyCallSiteId].isPolymorphic)
+        if (functionBody->GetCallSiteToCallApplyCallSiteArray())
         {
-            return nullptr;
+            Js::ProfileId callApplyCallSiteId = functionBody->GetCallSiteToCallApplyCallSiteArray()[callSiteId];
+            Assert(callApplyCallSiteId < functionBody->GetProfiledCallApplyCallSiteCount());
+
+            if (callApplyTargetInfo[callApplyCallSiteId].isPolymorphic)
+            {
+                return nullptr;
+            }
+
+            return GetFunctionInfo(functionBody, callApplyTargetInfo[callApplyCallSiteId].u.functionData.sourceId, callApplyTargetInfo[callApplyCallSiteId].u.functionData.functionId);
         }
 
-        return GetFunctionInfo(functionBody, callApplyTargetInfo[callApplyCallSiteId].u.functionData.sourceId, callApplyTargetInfo[callApplyCallSiteId].u.functionData.functionId);
+        return nullptr;
     }
 
     uint DynamicProfileInfo::GetLdFldCacheIndexFromCallSiteInfo(FunctionBody* functionBody, ProfileId callSiteId)

lib/Runtime/Language/InterpreterStackFrame.cpp

@@ -3905,11 +3905,15 @@ namespace Js
         {
             if ((functionInfo->IsBuiltInApplyFunction() || functionInfo->IsBuiltInCallFunction()) && targetFunction)
             {
-                Js::ProfileId callApplyCallSiteId = this->m_functionBody->GetCallSiteToCallApplyCallSiteArray()[profileId];
-                Assert(callApplyCallSiteId < functionBody->GetProfiledCallApplyCallSiteCount());
-                if (callApplyCallSiteId != Js::Constants::NoProfileId)
+                Js::ProfileId * callSiteToCallApplyCallSiteMap = this->m_functionBody->GetCallSiteToCallApplyCallSiteArray();
+                if (callSiteToCallApplyCallSiteMap)
                 {
-                    dynamicProfileInfo->RecordCallApplyTargetInfo(functionBody, callApplyCallSiteId, targetFunction->GetFunctionInfo(), targetFunction);
+                    Js::ProfileId callApplyCallSiteId = callSiteToCallApplyCallSiteMap[profileId];
+                    Assert(callApplyCallSiteId < functionBody->GetProfiledCallApplyCallSiteCount());
+                    if (callApplyCallSiteId != Js::Constants::NoProfileId)
+                    {
+                        dynamicProfileInfo->RecordCallApplyTargetInfo(functionBody, callApplyCallSiteId, targetFunction->GetFunctionInfo(), targetFunction);
+                    }
                 }
             }
         }