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

Jump to bottom

[NativeAOT] Refactored GCToEEInterface and RedhawkGCInterface implementations into separate files. #95991

Merged
merged 23 commits into from
Dec 16, 2023
Merged

[NativeAOT] Refactored GCToEEInterface and RedhawkGCInterface implementations into separate files. #95991

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3056eda
renamed gcrhinterface.h --> RedhawkGCInterface
VSadov Dec 13, 2023
633cb90
Separated gcrhenv on GCToEEInterface.cpp and RedhawkGCInterface.cpp
VSadov Dec 13, 2023
2544cca
cleanup RedhawkGCInterface a bit
VSadov Dec 13, 2023
3cbd29e
unneded includes
VSadov Dec 13, 2023
b147bb9
unify EnumGcRef
VSadov Dec 13, 2023
828a9f6
centry rename
VSadov Dec 13, 2023
9147059
Update src/coreclr/nativeaot/Runtime/MiscHelpers.cpp
VSadov Dec 14, 2023
96a3316
unix build
VSadov Dec 14, 2023
7b5b9f0
Do not cast scan funcs
VSadov Dec 14, 2023
ad346e5
RtuObjectRef --> OBJECTREF
VSadov Dec 14, 2023
c0ed59b
deleted spinlock.h
VSadov Dec 15, 2023
36d2c6d
moved GetAllocContext to .inl
VSadov Dec 15, 2023
7499700
renamed GCToEEInterface.cpp --> gcenv.ee.cpp
VSadov Dec 15, 2023
7457162
only init and scan left in RedhawkGCInterface
VSadov Dec 15, 2023
340d814
only scanning functionality in RedhawkGCInterface
VSadov Dec 15, 2023
58b6491
removed unused RedhawkGCInterface.h includes
VSadov Dec 15, 2023
9c88b3f
build fix
VSadov Dec 15, 2023
47a9be1
deleted RedhawkGCInterface class
VSadov Dec 15, 2023
f803a7a
fix arm build
VSadov Dec 15, 2023
d2c93ca
move FORCEINLINE methods from Thread.cpp to .inl
VSadov Dec 15, 2023
3945520
a few cleanups
VSadov Dec 16, 2023
fa0973b
removed LastAllocationEEType from Thread.
VSadov Dec 16, 2023
e5f4254
Apply suggestions from code review
VSadov Dec 16, 2023
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
Prev Previous commit
Next Next commit
build fix
  • Loading branch information
@VSadov
VSadov committed Dec 15, 2023
commit 9c88b3f47339317061bf06ae47ffb66231f967c8
2 changes: 1 addition & 1 deletion src/coreclr/nativeaot/Runtime/GCHelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ bool RhInitializeFinalization();
// Perform any runtime-startup initialization needed by the GC, HandleTable or environmental code in gcrhenv.
// The boolean parameter should be true if a server GC is required and false for workstation. Returns true on
// success or false if a subsystem failed to initialize.
static bool InitializeSubsystems()
bool InitializeSubsystems()
VSadov marked this conversation as resolved.
Show resolved Hide resolved
{
// Initialize the special MethodTable used to mark free list entries in the GC heap.
g_FreeObjectEEType.InitializeAsGcFreeType();
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/nativeaot/Runtime/RedhawkGCInterface.cpp
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NativeAOTGCInterface.cpp? some of them were replaced in #79217

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "regdisplay.h"

void PromoteCarefully(PTR_PTR_Object obj, uint32_t flags, ScanFunc* fnGcEnumRef, ScanContext* pSc)
static void PromoteCarefully(PTR_PTR_Object obj, uint32_t flags, ScanFunc* fnGcEnumRef, ScanContext* pSc)
{
//
// Sanity check that the flags contain only these values
Expand All @@ -40,7 +40,7 @@ void PromoteCarefully(PTR_PTR_Object obj, uint32_t flags, ScanFunc* fnGcEnumRef,
// real reference is interior or not and interior is the more conservative choice that will work for both and
// (b) because it might not be a real GC reference at all and in that case falsely listing the reference as
// non-interior will cause the GC to make assumptions and crash quite quickly.
void GcEnumObjectsConservatively(PTR_PTR_Object ppLowerBound, PTR_PTR_Object ppUpperBound, ScanFunc* fnGcEnumRef, ScanContext* pSc)
static void GcEnumObjectsConservatively(PTR_PTR_Object ppLowerBound, PTR_PTR_Object ppUpperBound, ScanFunc* fnGcEnumRef, ScanContext* pSc)
{
// Only report potential references in the promotion phase. Since we report everything as pinned there
// should be no work to do in the relocation phase.
Expand All @@ -66,7 +66,7 @@ void RedhawkGCInterface::EnumGcRefsInRegionConservatively(PTR_OBJECTREF pLowerBo
GcEnumObjectsConservatively(pLowerBound, pUpperBound, pfnEnumCallback, pvCallbackData);
}

void GcEnumObject(PTR_PTR_Object ppObj, uint32_t flags, ScanFunc* fnGcEnumRef, ScanContext* pSc)
static void GcEnumObject(PTR_PTR_Object ppObj, uint32_t flags, ScanFunc* fnGcEnumRef, ScanContext* pSc)
{
//
// Sanity check that the flags contain only these values
Expand Down
Loading