remove inconsistent check in BuildJITTimeData

lib/Backend/FunctionJITTimeInfo.cpp

@@ -22,132 +22,125 @@ FunctionJITTimeInfo::BuildJITTimeData(
     bool isForegroundJIT)
 {
     jitData->functionInfoAddr = (intptr_t)codeGenData->GetFunctionInfo();
+    jitData->localFuncId = codeGenData->GetFunctionInfo()->GetLocalFunctionId();
+    jitData->isAggressiveInliningEnabled = codeGenData->GetIsAggressiveInliningEnabled();
+    jitData->isInlined = codeGenData->GetIsInlined();
+    jitData->weakFuncRef = (intptr_t)codeGenData->GetWeakFuncRef();
+    jitData->inlineesBv = (BVFixedIDL*)(const BVFixed*)codeGenData->inlineesBv;
 
-    if (codeGenData->GetFunctionBody() && codeGenData->GetFunctionBody()->GetByteCode())
-    {
-        Js::FunctionBody * body = codeGenData->GetFunctionInfo()->GetParseableFunctionInfo()->GetFunctionBody();
-        jitData->bodyData = AnewStructZ(alloc, FunctionBodyDataIDL);
-        JITTimeFunctionBody::InitializeJITFunctionData(alloc, body, jitData->bodyData);
-    }
-    else
+    if (!codeGenData->GetFunctionBody() || !codeGenData->GetFunctionBody()->GetByteCode())
     {
         // outermost function must have a body, but inlinees may not (if they are builtins)
         Assert(isInlinee);
+        return;
     }
 
-    jitData->localFuncId = codeGenData->GetFunctionInfo()->GetLocalFunctionId();
-    jitData->isAggressiveInliningEnabled = codeGenData->GetIsAggressiveInliningEnabled();
-    jitData->isInlined = codeGenData->GetIsInlined();
-    jitData->weakFuncRef = (intptr_t)codeGenData->GetWeakFuncRef();
-
-    jitData->inlineesBv = (BVFixedIDL*)(const BVFixed*)codeGenData->inlineesBv;
+    Js::FunctionBody * body = codeGenData->GetFunctionInfo()->GetParseableFunctionInfo()->GetFunctionBody();
+    jitData->bodyData = AnewStructZ(alloc, FunctionBodyDataIDL);
+    JITTimeFunctionBody::InitializeJITFunctionData(alloc, body, jitData->bodyData);
 
-    if (codeGenData->GetFunctionInfo()->HasBody() && codeGenData->GetFunctionInfo()->GetFunctionProxy()->IsFunctionBody())
+    Assert(isInlinee == !!runtimeData);
+    const Js::FunctionCodeGenRuntimeData * targetRuntimeData = nullptr;
+    if (runtimeData)
     {
-        Assert(isInlinee == !!runtimeData);
-        const Js::FunctionCodeGenRuntimeData * targetRuntimeData = nullptr;
-        if (runtimeData)
-        {
-            // may be polymorphic, so seek the runtime data matching our JIT time data
-            targetRuntimeData = runtimeData->GetForTarget(codeGenData->GetFunctionInfo()->GetFunctionBody());
-        }
-        Js::FunctionBody * functionBody = codeGenData->GetFunctionBody();
-        if (functionBody->HasDynamicProfileInfo())
-        {
-            Assert(jitData->bodyData != nullptr);
-            ProfileDataIDL * profileData = AnewStruct(alloc, ProfileDataIDL);
-            JITTimeProfileInfo::InitializeJITProfileData(alloc, functionBody->GetAnyDynamicProfileInfo(), functionBody, profileData, isForegroundJIT);
+        // may be polymorphic, so seek the runtime data matching our JIT time data
+        targetRuntimeData = runtimeData->GetForTarget(codeGenData->GetFunctionInfo()->GetFunctionBody());
+    }
+    Js::FunctionBody * functionBody = codeGenData->GetFunctionBody();
+    if (functionBody->HasDynamicProfileInfo())
+    {
+        ProfileDataIDL * profileData = AnewStruct(alloc, ProfileDataIDL);
+        JITTimeProfileInfo::InitializeJITProfileData(alloc, functionBody->GetAnyDynamicProfileInfo(), functionBody, profileData, isForegroundJIT);
 
-            jitData->bodyData->profileData = profileData;
+        jitData->bodyData->profileData = profileData;
 
-            if (isInlinee)
-            {
-                // if not inlinee, NativeCodeGenerator will provide the address
-                // REVIEW: OOP JIT, for inlinees, is this actually necessary?
-                Js::ProxyEntryPointInfo *defaultEntryPointInfo = functionBody->GetDefaultEntryPointInfo();
-                Assert(defaultEntryPointInfo->IsFunctionEntryPointInfo());
-                Js::FunctionEntryPointInfo *functionEntryPointInfo = static_cast<Js::FunctionEntryPointInfo*>(defaultEntryPointInfo);
-                jitData->callsCountAddress = (intptr_t)&functionEntryPointInfo->callsCount;
+        if (isInlinee)
+        {
+            // if not inlinee, NativeCodeGenerator will provide the address
+            // REVIEW: OOP JIT, for inlinees, is this actually necessary?
+            Js::ProxyEntryPointInfo *defaultEntryPointInfo = functionBody->GetDefaultEntryPointInfo();
+            Assert(defaultEntryPointInfo->IsFunctionEntryPointInfo());
+            Js::FunctionEntryPointInfo *functionEntryPointInfo = static_cast<Js::FunctionEntryPointInfo*>(defaultEntryPointInfo);
+            jitData->callsCountAddress = (intptr_t)&functionEntryPointInfo->callsCount;
                 
-                jitData->sharedPropertyGuards = codeGenData->sharedPropertyGuards;
-                jitData->sharedPropGuardCount = codeGenData->sharedPropertyGuardCount;
-            }
+            jitData->sharedPropertyGuards = codeGenData->sharedPropertyGuards;
+            jitData->sharedPropGuardCount = codeGenData->sharedPropertyGuardCount;
         }
-        if (jitData->bodyData->profiledCallSiteCount > 0)
-        {
-            jitData->inlineeCount = jitData->bodyData->profiledCallSiteCount;
-            // using arena because we can't recycler allocate (may be on background), and heap freeing this is slightly complicated
-            jitData->inlinees = AnewArrayZ(alloc, FunctionJITTimeDataIDL*, jitData->bodyData->profiledCallSiteCount);
-            jitData->inlineesRecursionFlags = AnewArrayZ(alloc, boolean, jitData->bodyData->profiledCallSiteCount);
+    }
+    if (jitData->bodyData->profiledCallSiteCount > 0)
+    {
+        jitData->inlineeCount = jitData->bodyData->profiledCallSiteCount;
+        // using arena because we can't recycler allocate (may be on background), and heap freeing this is slightly complicated
+        jitData->inlinees = AnewArrayZ(alloc, FunctionJITTimeDataIDL*, jitData->bodyData->profiledCallSiteCount);
+        jitData->inlineesRecursionFlags = AnewArrayZ(alloc, boolean, jitData->bodyData->profiledCallSiteCount);
 
-            for (Js::ProfileId i = 0; i < jitData->bodyData->profiledCallSiteCount; ++i)
-            {
-                const Js::FunctionCodeGenJitTimeData * inlineeJITData = codeGenData->GetInlinee(i);
-                if (inlineeJITData == codeGenData)
-                {
-                    jitData->inlineesRecursionFlags[i] = TRUE;
-                }
-                else if (inlineeJITData != nullptr)
-                {
-                    const Js::FunctionCodeGenRuntimeData * inlineeRuntimeData = nullptr;
-                    if (inlineeJITData->GetFunctionInfo()->HasBody())
-                    {
-                        inlineeRuntimeData = isInlinee ? targetRuntimeData->GetInlinee(i) : functionBody->GetInlineeCodeGenRuntimeData(i);
-                    }
-                    jitData->inlinees[i] = AnewStructZ(alloc, FunctionJITTimeDataIDL);
-                    BuildJITTimeData(alloc, inlineeJITData, inlineeRuntimeData, jitData->inlinees[i], true, isForegroundJIT);
-                }
-            }
-        }
-        jitData->profiledRuntimeData = AnewStructZ(alloc, FunctionJITRuntimeIDL);
-        if (isInlinee && targetRuntimeData->ClonedInlineCaches()->HasInlineCaches())
+        for (Js::ProfileId i = 0; i < jitData->bodyData->profiledCallSiteCount; ++i)
         {
-            jitData->profiledRuntimeData->clonedCacheCount = jitData->bodyData->inlineCacheCount;
-            jitData->profiledRuntimeData->clonedInlineCaches = AnewArray(alloc, intptr_t, jitData->profiledRuntimeData->clonedCacheCount);
-            for (uint j = 0; j < jitData->bodyData->inlineCacheCount; ++j)
+            const Js::FunctionCodeGenJitTimeData * inlineeJITData = codeGenData->GetInlinee(i);
+            if (inlineeJITData == codeGenData)
             {
-                jitData->profiledRuntimeData->clonedInlineCaches[j] = (intptr_t)targetRuntimeData->ClonedInlineCaches()->GetInlineCache(j);
+                jitData->inlineesRecursionFlags[i] = TRUE;
             }
-        }
-        if (jitData->bodyData->inlineCacheCount > 0)
-        {
-            jitData->ldFldInlineeCount = jitData->bodyData->inlineCacheCount;
-            jitData->ldFldInlinees = AnewArrayZ(alloc, FunctionJITTimeDataIDL*, jitData->bodyData->inlineCacheCount);
-
-            Field(ObjTypeSpecFldInfo*)* objTypeSpecInfo = codeGenData->GetObjTypeSpecFldInfoArray()->GetInfoArray();
-            if(objTypeSpecInfo)
-            {
-                jitData->objTypeSpecFldInfoCount = jitData->bodyData->inlineCacheCount;
-                jitData->objTypeSpecFldInfoArray = (ObjTypeSpecFldIDL**)objTypeSpecInfo;
-            }
-            for (Js::InlineCacheIndex i = 0; i < jitData->bodyData->inlineCacheCount; ++i)
+            else if (inlineeJITData != nullptr)
             {
-                const Js::FunctionCodeGenJitTimeData * inlineeJITData = codeGenData->GetLdFldInlinee(i);
-                const Js::FunctionCodeGenRuntimeData * inlineeRuntimeData = isInlinee ? targetRuntimeData->GetLdFldInlinee(i) : functionBody->GetLdFldInlineeCodeGenRuntimeData(i);
-                if (inlineeJITData != nullptr)
+                const Js::FunctionCodeGenRuntimeData * inlineeRuntimeData = nullptr;
+                if (inlineeJITData->GetFunctionInfo()->HasBody())
                 {
-                    jitData->ldFldInlinees[i] = AnewStructZ(alloc, FunctionJITTimeDataIDL);
-                    BuildJITTimeData(alloc, inlineeJITData, inlineeRuntimeData, jitData->ldFldInlinees[i], true, isForegroundJIT);
+                    inlineeRuntimeData = isInlinee ? targetRuntimeData->GetInlinee(i) : functionBody->GetInlineeCodeGenRuntimeData(i);
                 }
+                jitData->inlinees[i] = AnewStructZ(alloc, FunctionJITTimeDataIDL);
+                BuildJITTimeData(alloc, inlineeJITData, inlineeRuntimeData, jitData->inlinees[i], true, isForegroundJIT);
             }
         }
-        if (!isInlinee && codeGenData->GetGlobalObjTypeSpecFldInfoCount() > 0)
+    }
+    jitData->profiledRuntimeData = AnewStructZ(alloc, FunctionJITRuntimeIDL);
+    if (isInlinee && targetRuntimeData->ClonedInlineCaches()->HasInlineCaches())
+    {
+        jitData->profiledRuntimeData->clonedCacheCount = jitData->bodyData->inlineCacheCount;
+        jitData->profiledRuntimeData->clonedInlineCaches = AnewArray(alloc, intptr_t, jitData->profiledRuntimeData->clonedCacheCount);
+        for (uint j = 0; j < jitData->bodyData->inlineCacheCount; ++j)
         {
-            Field(ObjTypeSpecFldInfo*)* globObjTypeSpecInfo = codeGenData->GetGlobalObjTypeSpecFldInfoArray();
-            Assert(globObjTypeSpecInfo != nullptr);
+            jitData->profiledRuntimeData->clonedInlineCaches[j] = (intptr_t)targetRuntimeData->ClonedInlineCaches()->GetInlineCache(j);
+        }
+    }
+    if (jitData->bodyData->inlineCacheCount > 0)
+    {
+        jitData->ldFldInlineeCount = jitData->bodyData->inlineCacheCount;
+        jitData->ldFldInlinees = AnewArrayZ(alloc, FunctionJITTimeDataIDL*, jitData->bodyData->inlineCacheCount);
 
-            jitData->globalObjTypeSpecFldInfoCount = codeGenData->GetGlobalObjTypeSpecFldInfoCount();
-            jitData->globalObjTypeSpecFldInfoArray = (ObjTypeSpecFldIDL**)globObjTypeSpecInfo;
+        Field(ObjTypeSpecFldInfo*)* objTypeSpecInfo = codeGenData->GetObjTypeSpecFldInfoArray()->GetInfoArray();
+        if(objTypeSpecInfo)
+        {
+            jitData->objTypeSpecFldInfoCount = jitData->bodyData->inlineCacheCount;
+            jitData->objTypeSpecFldInfoArray = (ObjTypeSpecFldIDL**)objTypeSpecInfo;
         }
-        const Js::FunctionCodeGenJitTimeData * nextJITData = codeGenData->GetNext();
-        if (nextJITData != nullptr)
+        for (Js::InlineCacheIndex i = 0; i < jitData->bodyData->inlineCacheCount; ++i)
         {
-            // only inlinee should be polymorphic
-            Assert(isInlinee);
-            jitData->next = AnewStructZ(alloc, FunctionJITTimeDataIDL);
-            BuildJITTimeData(alloc, nextJITData, runtimeData, jitData->next, true, isForegroundJIT);
+            const Js::FunctionCodeGenJitTimeData * inlineeJITData = codeGenData->GetLdFldInlinee(i);
+            const Js::FunctionCodeGenRuntimeData * inlineeRuntimeData = isInlinee ? targetRuntimeData->GetLdFldInlinee(i) : functionBody->GetLdFldInlineeCodeGenRuntimeData(i);
+            if (inlineeJITData != nullptr)
+            {
+                jitData->ldFldInlinees[i] = AnewStructZ(alloc, FunctionJITTimeDataIDL);
+                BuildJITTimeData(alloc, inlineeJITData, inlineeRuntimeData, jitData->ldFldInlinees[i], true, isForegroundJIT);
+            }
         }
     }
+    if (!isInlinee && codeGenData->GetGlobalObjTypeSpecFldInfoCount() > 0)
+    {
+        Field(ObjTypeSpecFldInfo*)* globObjTypeSpecInfo = codeGenData->GetGlobalObjTypeSpecFldInfoArray();
+        Assert(globObjTypeSpecInfo != nullptr);
+
+        jitData->globalObjTypeSpecFldInfoCount = codeGenData->GetGlobalObjTypeSpecFldInfoCount();
+        jitData->globalObjTypeSpecFldInfoArray = (ObjTypeSpecFldIDL**)globObjTypeSpecInfo;
+    }
+    const Js::FunctionCodeGenJitTimeData * nextJITData = codeGenData->GetNext();
+    if (nextJITData != nullptr)
+    {
+        // only inlinee should be polymorphic
+        Assert(isInlinee);
+        jitData->next = AnewStructZ(alloc, FunctionJITTimeDataIDL);
+        BuildJITTimeData(alloc, nextJITData, runtimeData, jitData->next, true, isForegroundJIT);
+    }
 }
 
 uint