Skip to content

Commit f337c17

Browse files
rajatdrajatd
committed
[MERGE chakra-core#5] Fix a nightly test break because of enabling inlining in jitted loop bodies.
Merge pull request chakra-core#5 from rajatd:inliningBreak Fix a nightly test break because of enabling inlining in jitted loop bodies. There was a bug in getting correct line number for an inlinee in a jitted loop body when doing error.stack. The code wasn't handling inlning in jitted loop bodies. Added support for that.
2 parents d975237 + c6c4de4 commit f337c17

12 files changed

Lines changed: 209 additions & 150 deletions

‎lib/Runtime/Base/FunctionBody.cpp‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2803,39 +2803,43 @@ namespace Js
28032803
BOOL FunctionBody::GetMatchingStatementMapFromNativeAddress(DWORD_PTR codeAddress, StatementData &data, uint loopNum, FunctionBody *inlinee /* = nullptr */)
28042804
{
28052805
SmallSpanSequence * spanSequence = nullptr;
2806-
FunctionEntryPointInfo * entryPoint = GetEntryPointFromNativeAddress(codeAddress);
28072806
DWORD_PTR nativeBaseAddress = NULL;
28082807

2809-
if (entryPoint != nullptr)
2808+
EntryPointInfo * entryPoint;
2809+
if (loopNum == -1)
28102810
{
2811-
spanSequence = entryPoint->GetNativeThrowSpanSequence();
2812-
nativeBaseAddress = entryPoint->GetNativeAddress();
2811+
entryPoint = GetEntryPointFromNativeAddress(codeAddress);
28132812
}
28142813
else
28152814
{
2816-
LoopEntryPointInfo * entryPoint = GetLoopEntryPointInfoFromNativeAddress(codeAddress, loopNum);
2817-
if (entryPoint != nullptr)
2818-
{
2819-
spanSequence = entryPoint->GetNativeThrowSpanSequence();
2820-
nativeBaseAddress = entryPoint->GetNativeAddress();
2821-
}
2815+
entryPoint = GetLoopEntryPointInfoFromNativeAddress(codeAddress, loopNum);
2816+
}
2817+
2818+
if (entryPoint != nullptr)
2819+
{
2820+
spanSequence = entryPoint->GetNativeThrowSpanSequence();
2821+
nativeBaseAddress = entryPoint->GetNativeAddress();
28222822
}
28232823

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

28262826
return GetMatchingStatementMap(data, statementIndex, inlinee);
28272827
}
28282828

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

2834-
if (entryPoint != nullptr)
2833+
if (loopNum == -1)
28352834
{
2836-
spanSequence = entryPoint->GetNativeThrowSpanSequence();
2835+
entryPoint = GetEntryPointFromNativeAddress(codeAddress);
2836+
}
2837+
else
2838+
{
2839+
entryPoint = GetLoopEntryPointInfoFromNativeAddress(codeAddress, loopNum);
28372840
}
28382841

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

28412845
return GetMatchingStatementMap(data, statementIndex, inlinee);

‎lib/Runtime/Base/FunctionBody.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2744,7 +2744,7 @@ namespace Js
27442744
void SetNativeThrowSpanSequence(SmallSpanSequence *seq, uint loopNum, LoopEntryPointInfo* entryPoint);
27452745

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

27492749
FunctionEntryPointInfo * GetEntryPointFromNativeAddress(DWORD_PTR codeAddress);
27502750
LoopEntryPointInfo * GetLoopEntryPointInfoFromNativeAddress(DWORD_PTR codeAddress, uint loopNum) const;

‎lib/Runtime/Language/JavascriptStackWalker.cpp‎

Lines changed: 144 additions & 102 deletions
Large diffs are not rendered by default.

‎lib/Runtime/Language/JavascriptStackWalker.h‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ namespace Js
9393
Assert(currentIndex == -1);
9494
}
9595

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

130-
static InlinedFrame *FromPhysicalFrame(StackFrame& currentFrame, void *entry, EntryPointInfo* entryPointInfo)
131-
{
132-
struct InlinedFrame *inlinedFrame = nullptr;
133-
if (!currentFrame.IsInStackCheckCode(entry))
134-
{
135-
void *frame = currentFrame.GetFrame();
136-
inlinedFrame = (struct InlinedFrame *)(((uint8 *)frame) - entryPointInfo->frameHeight);
137-
}
130+
static InlinedFrame *FromPhysicalFrame(StackFrame& currentFrame, const JavascriptStackWalker * const stackWalker, void *entry, EntryPointInfo* entryPointInfo);
138131

139-
return inlinedFrame;
140-
}
141132
};
142133

143134
void Initialize(int32 frameCount, __in_ecount(frameCount) InlinedFrame **frames, Js::ScriptFunction *parent);
@@ -151,6 +142,30 @@ namespace Js
151142
int32 currentIndex;
152143
int32 frameCount;
153144
};
145+
146+
class InternalFrameInfo
147+
{
148+
public:
149+
void *codeAddress;
150+
void *framePointer;
151+
size_t stackCheckCodeHeight;
152+
InternalFrameType frameType;
153+
InternalFrameType loopBodyFrameType;
154+
bool frameConsumed;
155+
156+
InternalFrameInfo() :
157+
codeAddress(nullptr),
158+
framePointer(nullptr),
159+
stackCheckCodeHeight((uint)-1),
160+
frameType(InternalFrameType_None),
161+
loopBodyFrameType(InternalFrameType_None),
162+
frameConsumed(false)
163+
{
164+
}
165+
166+
void Clear();
167+
void Set(void *codeAddress, void *framePointer, size_t stackCheckCodeHeight, InternalFrameType frameType, InternalFrameType loopBodyFrameType);
168+
};
154169
#endif
155170

156171
class JavascriptStackWalker
@@ -209,10 +224,10 @@ namespace Js
209224

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

212-
void SetCachedInternalFrameAddress(void *address, InternalFrameType type);
213-
void ClearCachedInternalFrameAddress();
214-
void SetCachedInternalFrameInfoForLoopBody();
215-
bool IsCurrentPhysicalFrameForLoopBody() const;
227+
void ClearCachedInternalFrameInfo();
228+
void SetCachedInternalFrameInfo(InternalFrameType frameType, InternalFrameType loopBodyFrameType);
229+
InternalFrameInfo GetCachedInternalFrameInfo() const { return this->lastInternalFrameInfo; }
230+
bool IsCurrentPhysicalFrameForLoopBody() const;
216231

217232
// noinline, we want to use own stack frame.
218233
static __declspec(noinline) BOOL GetCaller(JavascriptFunction** ppFunc, ScriptContext* scriptContext);
@@ -301,7 +316,6 @@ namespace Js
301316
bool isJavascriptFrame : 1;
302317
bool isNativeLibraryFrame : 1;
303318
bool isInitialFrame : 1; // If we need to walk the initial frame
304-
bool lastInternalFrameConsumed : 1;
305319
bool shouldDetectPartiallyInitializedInterpreterFrame : 1;
306320
bool previousInterpreterFrameIsFromBailout : 1;
307321
bool ehFramesBeingWalkedFromBailout : 1;
@@ -313,9 +327,7 @@ namespace Js
313327
Var GetCurrentNativeArgumentsObject() const;
314328
void SetCurrentNativeArgumentsObject(Var args);
315329

316-
void *lastInternalFrameAddress;
317-
InternalFrameType lastInternalFrameType;
318-
InternalFrameType lastInternalLoopBodyFrameType;
330+
InternalFrameInfo lastInternalFrameInfo;
319331

320332
mutable StackFrame currentFrame;
321333

‎lib/Runtime/Language/amd64/stackframe.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,9 @@ Js::Amd64StackFrame::SkipToFrame(void * returnAddress)
212212
}
213213

214214
bool
215-
Js::Amd64StackFrame::IsInStackCheckCode(void *entry)
215+
Js::Amd64StackFrame::IsInStackCheckCode(void *entry, void *codeAddr, size_t stackCheckCodeHeight)
216216
{
217-
void *const codeAddr = GetInstructionPointer();
218-
219-
return ((size_t(codeAddr) - size_t(entry)) <= this->stackCheckCodeHeight);
217+
return ((size_t(codeAddr) - size_t(entry)) <= stackCheckCodeHeight);
220218
}
221219

222220
Js::Amd64ContextsManager::Amd64ContextsManager()

‎lib/Runtime/Language/amd64/stackframe.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ namespace Js {
9090
void *GetAddressOfInstructionPointer() { return this->addressOfCodeAddr; }
9191
bool SkipToFrame(void * returnAddress);
9292
void *GetFrame() const;
93-
94-
bool IsInStackCheckCode(void *entry);
93+
size_t GetStackCheckCodeHeight() { return this->stackCheckCodeHeight; }
94+
static bool IsInStackCheckCode(void *entry, void * codeAddr, size_t stackCheckCodeHeight);
9595

9696
private:
9797
void* addressOfCodeAddr;

‎lib/Runtime/Language/arm/stackframe.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ ArmStackFrame::GetAddressOfReturnAddress(bool isCurrentContextNative, bool shoul
9494
}
9595

9696
bool
97-
ArmStackFrame::IsInStackCheckCode(void *entry) const
97+
ArmStackFrame::IsInStackCheckCode(void *entry, void *codeAddr, size_t stackCheckCodeHeight)
9898
{
9999
return ((size_t(codeAddr) - size_t(entry)) <= stackCheckCodeHeight);
100100
}

‎lib/Runtime/Language/arm/stackframe.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ namespace Js
5050
void *GetAddressOfReturnAddress(bool isCurrentContextNative = false, bool shouldCheckForNativeAddr = true);
5151
bool SkipToFrame(void * returnAddress);
5252
void *GetFrame() { return (void *)frame;};
53-
bool IsInStackCheckCode(void *entry) const;
53+
size_t GetStackCheckCodeHeight() { return this->stackCheckCodeHeight; }
54+
static bool IsInStackCheckCode(void *entry, void *codeAddr, size_t stackCheckCodeHeight);
5455

5556
private:
5657

‎lib/Runtime/Language/arm64/stackframe.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Arm64StackFrame::GetAddressOfReturnAddress(bool isCurrentContextNative, bool sho
9494
}
9595

9696
bool
97-
Arm64StackFrame::IsInStackCheckCode(void *entry) const
97+
Arm64StackFrame::IsInStackCheckCode(void *entry, void *codeAddr, size_t stackCheckCodeHeight)
9898
{
9999
return ((size_t(codeAddr) - size_t(entry)) <= stackCheckCodeHeight);
100100
}

‎lib/Runtime/Language/arm64/stackframe.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ namespace Js
5454
void *GetAddressOfReturnAddress(bool isCurrentContextNative = false, bool shouldCheckForNativeAddr = true);
5555
bool SkipToFrame(void * returnAddress);
5656
void *GetFrame() { return (void *)frame;};
57-
bool IsInStackCheckCode(void *entry) const;
57+
size_t GetStackCheckCodeHeight() { return this->stackCheckCodeHeight; }
58+
static bool IsInStackCheckCode(void *entry, void *codeAddr, size_t stackCheckCodeHeight);
5859

5960
private:
6061

0 commit comments

Comments
 (0)