Skip to content

fix issue when polymorphic inline info layouts differ in JIT and runtime data #1760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2016
Merged

fix issue when polymorphic inline info layouts differ in JIT and runtime data #1760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions lib/Backend/FunctionJITTimeInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ FunctionJITTimeInfo::BuildJITTimeData(
if (codeGenData->GetFunctionInfo()->HasBody())
{
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())
{
Expand Down Expand Up @@ -79,25 +85,21 @@ FunctionJITTimeInfo::BuildJITTimeData(
const Js::FunctionCodeGenRuntimeData * inlineeRuntimeData = nullptr;
if (inlineeJITData->GetFunctionInfo()->HasBody())
{
Js::FunctionBody * inlinee = inlineeJITData->GetFunctionInfo()->GetFunctionBody();
inlineeRuntimeData = isInlinee ? runtimeData->GetInlineeForTargetInlinee(i, inlinee) : functionBody->GetInlineeCodeGenRuntimeDataForTargetInlinee(i, inlinee);
inlineeRuntimeData = isInlinee ? targetRuntimeData->GetInlinee(i) : functionBody->GetInlineeCodeGenRuntimeData(i);
}
jitData->inlinees[i] = AnewStructZ(alloc, FunctionJITTimeDataIDL);
BuildJITTimeData(alloc, inlineeJITData, inlineeRuntimeData, jitData->inlinees[i], true, isForegroundJIT);
}
}
}
// TODO: OOP JIT, cleanup these checks
jitData->profiledRuntimeData = AnewStructZ(alloc, FunctionJITRuntimeIDL);
if (isInlinee && runtimeData->ClonedInlineCaches()->HasInlineCaches())
if (isInlinee && targetRuntimeData->ClonedInlineCaches()->HasInlineCaches())
{
// REVIEW: OOP JIT is this safe to be doing in background?
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)
{
// REVIEW: OOP JIT, what to do with WriteBarrierPtr?
jitData->profiledRuntimeData->clonedInlineCaches[j] = (intptr_t)runtimeData->ClonedInlineCaches()->GetInlineCache(j);
jitData->profiledRuntimeData->clonedInlineCaches[j] = (intptr_t)targetRuntimeData->ClonedInlineCaches()->GetInlineCache(j);
}
}
if (jitData->bodyData->inlineCacheCount > 0)
Expand All @@ -115,7 +117,7 @@ FunctionJITTimeInfo::BuildJITTimeData(
for (Js::InlineCacheIndex i = 0; i < jitData->bodyData->inlineCacheCount; ++i)
{
const Js::FunctionCodeGenJitTimeData * inlineeJITData = codeGenData->GetLdFldInlinee(i);
const Js::FunctionCodeGenRuntimeData * inlineeRuntimeData = isInlinee ? runtimeData->GetLdFldInlinee(i) : functionBody->GetLdFldInlineeCodeGenRuntimeData(i);
const Js::FunctionCodeGenRuntimeData * inlineeRuntimeData = isInlinee ? targetRuntimeData->GetLdFldInlinee(i) : functionBody->GetLdFldInlineeCodeGenRuntimeData(i);
if (inlineeJITData != nullptr)
{
jitData->ldFldInlinees[i] = AnewStructZ(alloc, FunctionJITTimeDataIDL);
Expand All @@ -138,12 +140,7 @@ FunctionJITTimeInfo::BuildJITTimeData(
// only inlinee should be polymorphic
Assert(isInlinee);
jitData->next = AnewStructZ(alloc, FunctionJITTimeDataIDL);
const Js::FunctionCodeGenRuntimeData * nextRuntimeData = nullptr;
if (nextJITData->GetFunctionInfo()->HasBody())
{
nextRuntimeData = runtimeData->GetNextForTarget(nextJITData->GetFunctionInfo()->GetFunctionBody());
}
BuildJITTimeData(alloc, nextJITData, nextRuntimeData, jitData->next, true, isForegroundJIT);
BuildJITTimeData(alloc, nextJITData, runtimeData, jitData->next, true, isForegroundJIT);
}
}
}
Expand Down
12 changes: 7 additions & 5 deletions lib/Runtime/Language/FunctionCodeGenRuntimeData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,16 @@ namespace Js
return &clonedInlineCaches;
}

FunctionCodeGenRuntimeData * FunctionCodeGenRuntimeData::GetNextForTarget(FunctionBody *targetFuncBody) const
const FunctionCodeGenRuntimeData * FunctionCodeGenRuntimeData::GetForTarget(FunctionBody *targetFuncBody) const
{
FunctionCodeGenRuntimeData * next = this->next;
if (next->GetFunctionBody() != targetFuncBody)
const FunctionCodeGenRuntimeData * target = this;
while (target && target->GetFunctionBody() != targetFuncBody)
{
next = next->next;
target = target->next;
}
return next;
// we should always find the info
Assert(target);
return target;
}

const FunctionCodeGenRuntimeData *FunctionCodeGenRuntimeData::GetInlinee(const ProfileId profiledCallSiteId) const
Expand Down
2 changes: 1 addition & 1 deletion lib/Runtime/Language/FunctionCodeGenRuntimeData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace Js
public:
FunctionBody *GetFunctionBody() const;
FunctionCodeGenRuntimeData *GetNext() const { return next; };
FunctionCodeGenRuntimeData *GetNextForTarget(FunctionBody *targetFuncBody) const;
const FunctionCodeGenRuntimeData *GetForTarget(FunctionBody *targetFuncBody) const;
const InlineCachePointerArray<InlineCache> *ClonedInlineCaches() const;
InlineCachePointerArray<InlineCache> *ClonedInlineCaches();

Expand Down