Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 3ad3d00

Browse files
pleathchakrabot
authored andcommitted
deps: update ChakraCore to chakra-core/ChakraCore@e7945af187
[1.8>1.9] [MERGE #4667 @pleath] MSFT:15176668: Port remote stack walker fix Merge pull request #4667 from pleath:15176668 Reviewed-By: chakrabot <chakrabot@users.noreply.github.com>
1 parent 097fcd0 commit 3ad3d00

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

deps/chakrashim/core/lib/Runtime/Base/LeaveScriptObject.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Js
88
{
99
EnterScriptObject::EnterScriptObject(ScriptContext* scriptContext, ScriptEntryExitRecord* entryExitRecord,
10-
void * addrOfReturnAddress, bool doCleanup, bool isCallRoot, bool hasCaller)
10+
void * returnAddress, void * addrOfReturnAddress, bool doCleanup, bool isCallRoot, bool hasCaller)
1111
{
1212
Assert(scriptContext);
1313

@@ -35,6 +35,7 @@ namespace Js
3535
false;
3636

3737
// Initialize the entry exit record
38+
entryExitRecord->returnAddrOfScriptEntryFunction = returnAddress;
3839
entryExitRecord->addrOfReturnAddrOfScriptEntryFunction = addrOfReturnAddress;
3940
entryExitRecord->hasCaller = hasCaller;
4041
entryExitRecord->scriptContext = scriptContext;

deps/chakrashim/core/lib/Runtime/Base/LeaveScriptObject.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Js::ScriptEntryExitRecord __entryExitRecord = {0}; \
2222
SAVE_FS0(); \
2323
Js::EnterScriptObject __enterScriptObject = Js::EnterScriptObject(__localScriptContext, &__entryExitRecord, \
24-
_AddressOfReturnAddress(), doCleanup, isCallRoot, hasCaller); \
24+
_ReturnAddress(), _AddressOfReturnAddress(), doCleanup, isCallRoot, hasCaller); \
2525
__localScriptContext->OnScriptStart(isCallRoot, isScript); \
2626
__enterScriptObject.VerifyEnterScript();
2727

@@ -137,7 +137,7 @@ namespace Js
137137
JavascriptLibrary* library; // stack pin the library.
138138
public:
139139
EnterScriptObject(ScriptContext* scriptContext, ScriptEntryExitRecord* entryExitRecord,
140-
void * addrOfReturnAddress, bool doCleanup, bool isCallRoot, bool hasCaller);
140+
void * returnAddress, void * addrOfReturnAddress, bool doCleanup, bool isCallRoot, bool hasCaller);
141141

142142
void VerifyEnterScript();
143143

deps/chakrashim/core/lib/Runtime/Base/ScriptContext.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ namespace Js
370370
#endif
371371
Js::ImplicitCallFlags savedImplicitCallFlags;
372372

373+
void * returnAddrOfScriptEntryFunction;
373374
void * addrOfReturnAddrOfScriptEntryFunction;
374375
void * frameIdOfScriptExitFunction; // the frameAddres in x86, the return address in amd64/arm_soc
375376
ScriptContext * scriptContext;

0 commit comments

Comments
 (0)