Skip to content

Handle failure to reserve pre-reserved section when initializing server thread context. OS#15209418 #5536

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
Jul 26, 2018
Merged

Handle failure to reserve pre-reserved section when initializing server thread context. OS#15209418 #5536

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
6 changes: 6 additions & 0 deletions lib/Backend/ServerThreadContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,12 @@ ServerThreadContext::CanCreatePreReservedSegment() const
return m_canCreatePreReservedSegment;
}

void
ServerThreadContext::SetCanCreatePreReservedSegment(bool value)
{
m_canCreatePreReservedSegment = value;
}

bool
ServerThreadContext::IsNumericProperty(Js::PropertyId propertyId)
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Backend/ServerThreadContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class ServerThreadContext : public ThreadContextInfo
intptr_t GetRuntimeChakraBaseAddress() const;
intptr_t GetRuntimeCRTBaseAddress() const;
bool CanCreatePreReservedSegment() const;

void SetCanCreatePreReservedSegment(bool value);
static intptr_t GetJITCRTBaseAddress();

private:
Expand Down
1 change: 1 addition & 0 deletions lib/JITServer/JITServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ ServerInitializeThreadContext(
if (!PHASE_OFF1(Js::PreReservedHeapAllocPhase))
{
*prereservedRegionAddr = (intptr_t)contextInfo->GetPreReservedSectionAllocator()->EnsurePreReservedRegion();
contextInfo->SetCanCreatePreReservedSegment(*prereservedRegionAddr != 0);
}
#if !defined(_M_ARM)
*jitThunkAddr = (intptr_t)contextInfo->GetJITThunkEmitter()->EnsureInitialized();
Expand Down