Skip to content
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

Fix a nightly test break because of enabling inlining in jitted loop bodies. #5

Merged
merged 1 commit into from
Jan 11, 2016
Merged

Fix a nightly test break because of enabling inlining in jitted loop bodies. #5

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
34 changes: 19 additions & 15 deletions lib/Runtime/Base/FunctionBody.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2803,39 +2803,43 @@ namespace Js
BOOL FunctionBody::GetMatchingStatementMapFromNativeAddress(DWORD_PTR codeAddress, StatementData &data, uint loopNum, FunctionBody *inlinee /* = nullptr */)
{
SmallSpanSequence * spanSequence = nullptr;
FunctionEntryPointInfo * entryPoint = GetEntryPointFromNativeAddress(codeAddress);
DWORD_PTR nativeBaseAddress = NULL;

if (entryPoint != nullptr)
EntryPointInfo * entryPoint;
if (loopNum == -1)
{
spanSequence = entryPoint->GetNativeThrowSpanSequence();
nativeBaseAddress = entryPoint->GetNativeAddress();
entryPoint = GetEntryPointFromNativeAddress(codeAddress);
}
else
{
LoopEntryPointInfo * entryPoint = GetLoopEntryPointInfoFromNativeAddress(codeAddress, loopNum);
if (entryPoint != nullptr)
{
spanSequence = entryPoint->GetNativeThrowSpanSequence();
nativeBaseAddress = entryPoint->GetNativeAddress();
}
entryPoint = GetLoopEntryPointInfoFromNativeAddress(codeAddress, loopNum);
}

if (entryPoint != nullptr)
{
spanSequence = entryPoint->GetNativeThrowSpanSequence();
nativeBaseAddress = entryPoint->GetNativeAddress();
}

int statementIndex = GetStatementIndexFromNativeAddress(spanSequence, codeAddress, nativeBaseAddress);

return GetMatchingStatementMap(data, statementIndex, inlinee);
}

BOOL FunctionBody::GetMatchingStatementMapFromNativeOffset(DWORD_PTR codeAddress, uint32 offset, StatementData &data, FunctionBody *inlinee /* = nullptr */)
BOOL FunctionBody::GetMatchingStatementMapFromNativeOffset(DWORD_PTR codeAddress, uint32 offset, StatementData &data, uint loopNum, FunctionBody *inlinee /* = nullptr */)
{
SmallSpanSequence * spanSequence = nullptr;
FunctionEntryPointInfo * entryPoint = GetEntryPointFromNativeAddress(codeAddress);
EntryPointInfo * entryPoint;

if (entryPoint != nullptr)
if (loopNum == -1)
{
spanSequence = entryPoint->GetNativeThrowSpanSequence();
entryPoint = GetEntryPointFromNativeAddress(codeAddress);
}
else
{
entryPoint = GetLoopEntryPointInfoFromNativeAddress(codeAddress, loopNum);
}

SmallSpanSequence *spanSequence = entryPoint ? entryPoint->GetNativeThrowSpanSequence() : nullptr;
int statementIndex = GetStatementIndexFromNativeOffset(spanSequence, offset);

return GetMatchingStatementMap(data, statementIndex, inlinee);
Expand Down
2 changes: 1 addition & 1 deletion lib/Runtime/Base/FunctionBody.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2744,7 +2744,7 @@ namespace Js
void SetNativeThrowSpanSequence(SmallSpanSequence *seq, uint loopNum, LoopEntryPointInfo* entryPoint);

BOOL GetMatchingStatementMapFromNativeAddress(DWORD_PTR codeAddress, StatementData &data, uint loopNum, FunctionBody *inlinee = nullptr);
BOOL GetMatchingStatementMapFromNativeOffset(DWORD_PTR codeAddress, uint32 offset, StatementData &data, FunctionBody *inlinee = nullptr);
BOOL GetMatchingStatementMapFromNativeOffset(DWORD_PTR codeAddress, uint32 offset, StatementData &data, uint loopNum, FunctionBody *inlinee = nullptr);

FunctionEntryPointInfo * GetEntryPointFromNativeAddress(DWORD_PTR codeAddress);
LoopEntryPointInfo * GetLoopEntryPointInfoFromNativeAddress(DWORD_PTR codeAddress, uint loopNum) const;
Expand Down
246 changes: 144 additions & 102 deletions lib/Runtime/Language/JavascriptStackWalker.cpp
View file
Open in desktop

Large diffs are not rendered by default.

50 changes: 31 additions & 19 deletions lib/Runtime/Language/JavascriptStackWalker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ namespace Js
Assert(currentIndex == -1);
}

static bool FromPhysicalFrame(InlinedFrameWalker& self, StackFrame& physicalFrame, Js::ScriptFunction *parent, bool fromBailout = false, int loopNum = -1, bool noAlloc = false);
static bool FromPhysicalFrame(InlinedFrameWalker& self, StackFrame& physicalFrame, Js::ScriptFunction *parent, bool fromBailout = false, int loopNum = -1, const JavascriptStackWalker * const walker = nullptr, bool noAlloc = false);
void Close();
bool Next(CallInfo& callInfo);
size_t GetArgc() const;
Expand Down Expand Up @@ -127,17 +127,8 @@ namespace Js
return (InlinedFrame*)next;
}

static InlinedFrame *FromPhysicalFrame(StackFrame& currentFrame, void *entry, EntryPointInfo* entryPointInfo)
{
struct InlinedFrame *inlinedFrame = nullptr;
if (!currentFrame.IsInStackCheckCode(entry))
{
void *frame = currentFrame.GetFrame();
inlinedFrame = (struct InlinedFrame *)(((uint8 *)frame) - entryPointInfo->frameHeight);
}
static InlinedFrame *FromPhysicalFrame(StackFrame& currentFrame, const JavascriptStackWalker * const stackWalker, void *entry, EntryPointInfo* entryPointInfo);

return inlinedFrame;
}
};

void Initialize(int32 frameCount, __in_ecount(frameCount) InlinedFrame **frames, Js::ScriptFunction *parent);
Expand All @@ -151,6 +142,30 @@ namespace Js
int32 currentIndex;
int32 frameCount;
};

class InternalFrameInfo
{
public:
void *codeAddress;
void *framePointer;
size_t stackCheckCodeHeight;
InternalFrameType frameType;
InternalFrameType loopBodyFrameType;
bool frameConsumed;

InternalFrameInfo() :
codeAddress(nullptr),
framePointer(nullptr),
stackCheckCodeHeight((uint)-1),
frameType(InternalFrameType_None),
loopBodyFrameType(InternalFrameType_None),
frameConsumed(false)
{
}

void Clear();
void Set(void *codeAddress, void *framePointer, size_t stackCheckCodeHeight, InternalFrameType frameType, InternalFrameType loopBodyFrameType);
};
#endif

class JavascriptStackWalker
Expand Down Expand Up @@ -209,10 +224,10 @@ namespace Js

static bool TryIsTopJavaScriptFrameNative(ScriptContext* scriptContext, bool* istopFrameNative, bool ignoreLibraryCode = false);

void SetCachedInternalFrameAddress(void *address, InternalFrameType type);
void ClearCachedInternalFrameAddress();
void SetCachedInternalFrameInfoForLoopBody();
bool IsCurrentPhysicalFrameForLoopBody() const;
void ClearCachedInternalFrameInfo();
void SetCachedInternalFrameInfo(InternalFrameType frameType, InternalFrameType loopBodyFrameType);
InternalFrameInfo GetCachedInternalFrameInfo() const { return this->lastInternalFrameInfo; }
bool IsCurrentPhysicalFrameForLoopBody() const;

// noinline, we want to use own stack frame.
static __declspec(noinline) BOOL GetCaller(JavascriptFunction** ppFunc, ScriptContext* scriptContext);
Expand Down Expand Up @@ -301,7 +316,6 @@ namespace Js
bool isJavascriptFrame : 1;
bool isNativeLibraryFrame : 1;
bool isInitialFrame : 1; // If we need to walk the initial frame
bool lastInternalFrameConsumed : 1;
bool shouldDetectPartiallyInitializedInterpreterFrame : 1;
bool previousInterpreterFrameIsFromBailout : 1;
bool ehFramesBeingWalkedFromBailout : 1;
Expand All @@ -313,9 +327,7 @@ namespace Js
Var GetCurrentNativeArgumentsObject() const;
void SetCurrentNativeArgumentsObject(Var args);

void *lastInternalFrameAddress;
InternalFrameType lastInternalFrameType;
InternalFrameType lastInternalLoopBodyFrameType;
InternalFrameInfo lastInternalFrameInfo;

mutable StackFrame currentFrame;

Expand Down
6 changes: 2 additions & 4 deletions lib/Runtime/Language/amd64/stackframe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,9 @@ Js::Amd64StackFrame::SkipToFrame(void * returnAddress)
}

bool
Js::Amd64StackFrame::IsInStackCheckCode(void *entry)
Js::Amd64StackFrame::IsInStackCheckCode(void *entry, void *codeAddr, size_t stackCheckCodeHeight)
{
void *const codeAddr = GetInstructionPointer();

return ((size_t(codeAddr) - size_t(entry)) <= this->stackCheckCodeHeight);
return ((size_t(codeAddr) - size_t(entry)) <= stackCheckCodeHeight);
}

Js::Amd64ContextsManager::Amd64ContextsManager()
Expand Down
4 changes: 2 additions & 2 deletions lib/Runtime/Language/amd64/stackframe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ namespace Js {
void *GetAddressOfInstructionPointer() { return this->addressOfCodeAddr; }
bool SkipToFrame(void * returnAddress);
void *GetFrame() const;

bool IsInStackCheckCode(void *entry);
size_t GetStackCheckCodeHeight() { return this->stackCheckCodeHeight; }
static bool IsInStackCheckCode(void *entry, void * codeAddr, size_t stackCheckCodeHeight);

private:
void* addressOfCodeAddr;
Expand Down
2 changes: 1 addition & 1 deletion lib/Runtime/Language/arm/stackframe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ ArmStackFrame::GetAddressOfReturnAddress(bool isCurrentContextNative, bool shoul
}

bool
ArmStackFrame::IsInStackCheckCode(void *entry) const
ArmStackFrame::IsInStackCheckCode(void *entry, void *codeAddr, size_t stackCheckCodeHeight)
{
return ((size_t(codeAddr) - size_t(entry)) <= stackCheckCodeHeight);
}
Expand Down
3 changes: 2 additions & 1 deletion lib/Runtime/Language/arm/stackframe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ namespace Js
void *GetAddressOfReturnAddress(bool isCurrentContextNative = false, bool shouldCheckForNativeAddr = true);
bool SkipToFrame(void * returnAddress);
void *GetFrame() { return (void *)frame;};
bool IsInStackCheckCode(void *entry) const;
size_t GetStackCheckCodeHeight() { return this->stackCheckCodeHeight; }
static bool IsInStackCheckCode(void *entry, void *codeAddr, size_t stackCheckCodeHeight);

private:

Expand Down
2 changes: 1 addition & 1 deletion lib/Runtime/Language/arm64/stackframe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Arm64StackFrame::GetAddressOfReturnAddress(bool isCurrentContextNative, bool sho
}

bool
Arm64StackFrame::IsInStackCheckCode(void *entry) const
Arm64StackFrame::IsInStackCheckCode(void *entry, void *codeAddr, size_t stackCheckCodeHeight)
{
return ((size_t(codeAddr) - size_t(entry)) <= stackCheckCodeHeight);
}
Expand Down
3 changes: 2 additions & 1 deletion lib/Runtime/Language/arm64/stackframe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ namespace Js
void *GetAddressOfReturnAddress(bool isCurrentContextNative = false, bool shouldCheckForNativeAddr = true);
bool SkipToFrame(void * returnAddress);
void *GetFrame() { return (void *)frame;};
bool IsInStackCheckCode(void *entry) const;
size_t GetStackCheckCodeHeight() { return this->stackCheckCodeHeight; }
static bool IsInStackCheckCode(void *entry, void *codeAddr, size_t stackCheckCodeHeight);

private:

Expand Down
4 changes: 2 additions & 2 deletions lib/Runtime/Language/i386/stackframe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ X86StackFrame::SkipToFrame(void * frameAddress)
}

bool
X86StackFrame::IsInStackCheckCode(void *entry) const
X86StackFrame::IsInStackCheckCode(void *entry, void *codeAddr, size_t stackCheckCodeHeight)
{
return ((size_t(codeAddr) - size_t(entry)) <= this->stackCheckCodeHeight);
return ((size_t(codeAddr) - size_t(entry)) <= stackCheckCodeHeight);
}

};
3 changes: 2 additions & 1 deletion lib/Runtime/Language/i386/stackframe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ namespace Js {
void SetReturnAddress(void * address) { frame[1] = address; }
bool SkipToFrame(void * frameAddress);

bool IsInStackCheckCode(void *entry) const;
size_t GetStackCheckCodeHeight() { return this->stackCheckCodeHeight; }
static bool IsInStackCheckCode(void *entry, void *codeAddr, size_t stackCheckCodeHeight);

private:
void ** frame; // ebp
Expand Down