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

Fold IND(frozenObj, CNS) #85127

Merged
merged 15 commits into from
Apr 26, 2023
Merged

Fold IND(frozenObj, CNS) #85127

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
160fedd
Introduce readObject
EgorBo Apr 21, 2023
b266af4
Address feedback
EgorBo Apr 21, 2023
bd905ca
Merge branch 'main' of github.com:dotnet/runtime into readObj
EgorBo Apr 21, 2023
a61f0ac
Add a test for NAOT
EgorBo Apr 21, 2023
ad877e3
Merge branch 'main' of github.com:dotnet/runtime into readObj
EgorBo Apr 23, 2023
74d0d17
Update src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoIm…
EgorBo Apr 23, 2023
46582e2
Merge branch 'main' of github.com:dotnet/runtime into readObj
EgorBo Apr 23, 2023
02c30b8
Address feedback
EgorBo Apr 23, 2023
0da2398
remove assert
EgorBo Apr 23, 2023
d969475
Address feedback
EgorBo Apr 23, 2023
a3b2b06
missing rename
EgorBo Apr 23, 2023
11d801e
Rename getObjectType -> getObjectContent; getReadonlyStaticFieldValue…
EgorBo Apr 23, 2023
1b6a8d9
make formatter happy
EgorBo Apr 23, 2023
099139c
Merge branch 'main' of github.com:dotnet/runtime into readObj
EgorBo Apr 24, 2023
1ae3ded
Merge branch 'main' into readObj
EgorBo Apr 25, 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
7 changes: 7 additions & 0 deletions src/coreclr/inc/corinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3244,6 +3244,13 @@ class ICorDynamicInfo : public ICorStaticInfo
bool ignoreMovableObjects = true
) = 0;

virtual bool getObjectData(
Copy link
Member

Choose a reason for hiding this comment

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

Nit: Both methods return the same thing, but one calls it Value and the other calls Data. Can we use the same name for the thing that the method returns?

Some ideas:

  • readStaticField + readObject
  • readStaticFieldData + readObjectData
  • getStaticFieldContent + getObjectContent

(getReadonlyStaticFieldValue method does not seem to be strictly limited to readonly static fields, so the name can be relaxed).

Copy link
Member Author

Choose a reason for hiding this comment

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

Decided to go with:

getObjectType -> getObjectContent; 
getReadonlyStaticFieldValue -> getStaticFieldContent

Put a condition to getObjectContent to give up on types with GC pointers - want to have a real use case to test properly if you don't mind.

CORINFO_OBJECT_HANDLE obj,
uint8_t* buffer,
int bufferSize,
int valueOffset
) = 0;

// If pIsSpeculative is NULL, return the class handle for the value of ref-class typed
// static readonly fields, if there is a unique location for the static and the class
// is already initialized.
Expand Down
6 changes: 6 additions & 0 deletions src/coreclr/inc/icorjitinfoimpl_generated.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,12 @@ bool getReadonlyStaticFieldValue(
int valueOffset,
bool ignoreMovableObjects) override;

bool getObjectData(
CORINFO_OBJECT_HANDLE obj,
uint8_t* buffer,
int bufferSize,
int valueOffset) override;

CORINFO_CLASS_HANDLE getStaticFieldCurrentClass(
CORINFO_FIELD_HANDLE field,
bool* pIsSpeculative) override;
Expand Down
10 changes: 5 additions & 5 deletions src/coreclr/inc/jiteeversionguid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ typedef const GUID *LPCGUID;
#define GUID_DEFINED
#endif // !GUID_DEFINED

constexpr GUID JITEEVersionIdentifier = { /* 236d7997-3d71-45f9-b7d7-5241ad89a56f */
0x236d7997,
0x3d71,
0x45f9,
{ 0xb7, 0xd7, 0x52, 0x41, 0xad, 0x89, 0xa5, 0x6f }
constexpr GUID JITEEVersionIdentifier = { /* 7658c1e7-a363-4ccf-a1a4-1486bac7b5c8 */
0x7658c1e7,
0xa363,
0x4ccf,
{ 0xa1, 0xa4, 0x14, 0x86, 0xba, 0xc7, 0xb5, 0xc8 }
};

//////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/jit/ICorJitInfo_names_generated.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ DEF_CLR_API(canAccessFamily)
DEF_CLR_API(isRIDClassDomainID)
DEF_CLR_API(getClassDomainID)
DEF_CLR_API(getReadonlyStaticFieldValue)
DEF_CLR_API(getObjectData)
DEF_CLR_API(getStaticFieldCurrentClass)
DEF_CLR_API(getVarArgsHandle)
DEF_CLR_API(canGetVarArgsHandle)
Expand Down
12 changes: 12 additions & 0 deletions src/coreclr/jit/ICorJitInfo_wrapper_generated.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,6 +1535,18 @@ bool WrapICorJitInfo::getReadonlyStaticFieldValue(
return temp;
}

bool WrapICorJitInfo::getObjectData(
CORINFO_OBJECT_HANDLE obj,
uint8_t* buffer,
int bufferSize,
int valueOffset)
{
API_ENTER(getObjectData);
bool temp = wrapHnd->getObjectData(obj, buffer, bufferSize, valueOffset);
API_LEAVE(getObjectData);
return temp;
}

CORINFO_CLASS_HANDLE WrapICorJitInfo::getStaticFieldCurrentClass(
CORINFO_FIELD_HANDLE field,
bool* pIsSpeculative)
Expand Down
Loading