Skip to content

Commit f754b42

Browse files
committed
[MERGE #5313 @sigatrev] OS#17833716 fix ARM hasBailedOut handling
Merge pull request #5313 from sigatrev:uses/magardn/armbailout
2 parents 88560a1 + 62e914b commit f754b42

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/Runtime/Language/JavascriptExceptionOperators.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ namespace Js
287287
void *continuation = nullptr;
288288
JavascriptExceptionObject *exception = nullptr;
289289
void * tryCatchFrameAddr = nullptr;
290-
Js::JavascriptExceptionOperators::HasBailedOutPtrStack hasBailedOutPtrStack(scriptContext, (bool*)((char*)framePtr + hasBailedOutOffset));
290+
Js::JavascriptExceptionOperators::HasBailedOutPtrStack hasBailedOutPtrStack(scriptContext, (bool*)((char*)localsPtr + hasBailedOutOffset));
291291

292292
PROBE_STACK(scriptContext, Constants::MinStackJitEHBailout + argsSize);
293293
{
@@ -359,7 +359,7 @@ namespace Js
359359
{
360360
void *tryContinuation = nullptr;
361361
JavascriptExceptionObject *exception = nullptr;
362-
Js::JavascriptExceptionOperators::HasBailedOutPtrStack hasBailedOutPtrStack(scriptContext, (bool*)((char*)framePtr + hasBailedOutOffset));
362+
Js::JavascriptExceptionOperators::HasBailedOutPtrStack hasBailedOutPtrStack(scriptContext, (bool*)((char*)localsPtr + hasBailedOutOffset));
363363

364364
PROBE_STACK(scriptContext, Constants::MinStackJitEHBailout + argsSize);
365365
try

0 commit comments

Comments
 (0)