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

[release/9.0] Ensure the layout of StackAllocatedBox<T> matches boxed layouts #107075

Merged
merged 5 commits into from
Aug 29, 2024
Merged

[release/9.0] Ensure the layout of StackAllocatedBox<T> matches boxed layouts #107075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9b552e
Ensure the layout of `StackAllocatedBox<T>` matches boxed layouts
jakobbotsch Aug 27, 2024
ecfa62e
Run jit-format
jakobbotsch Aug 27, 2024
52fd08e
Correct enum
jakobbotsch Aug 27, 2024
69dba4b
Merge branch 'release/9.0' into backport/pr-107050-to-release/9.0
jeffschwMSFT Aug 28, 2024
2674cc1
Merge branch 'release/9.0' into backport/pr-107050-to-release/9.0
jeffschwMSFT Aug 29, 2024
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
4 changes: 3 additions & 1 deletion src/coreclr/jit/valuenum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10299,7 +10299,9 @@ void ValueNumStore::vnDumpSimdType(Compiler* comp, VNFuncApp* simdType)
int simdSize = ConstantValue<int>(simdType->m_args[0]);
CorInfoType baseJitType = (CorInfoType)ConstantValue<int>(simdType->m_args[1]);

printf("%s(simd%d, %s)", VNFuncName(simdType->m_func), simdSize, varTypeName(JitType2PreciseVarType(baseJitType)));
printf("%s(simd%d, %s)", VNFuncName(simdType->m_func), simdSize,
baseJitType == CORINFO_TYPE_UNDEF ? varTypeName(TYP_UNDEF)
: varTypeName(JitType2PreciseVarType(baseJitType)));
}
#endif // FEATURE_SIMD

Expand Down
1 change: 1 addition & 0 deletions src/coreclr/vm/corelib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,6 +1129,7 @@ DEFINE_METHOD(ICASTABLEHELPERS, GETIMPLTYPE, GetImplType, SM_ICast
#endif // FEATURE_ICASTABLE

DEFINE_CLASS(STACKALLOCATEDBOX, CompilerServices, StackAllocatedBox`1)
DEFINE_FIELD(STACKALLOCATEDBOX, VALUE, _value)

DEFINE_CLASS(UTF8STRINGMARSHALLER, Marshalling, Utf8StringMarshaller)
DEFINE_METHOD(UTF8STRINGMARSHALLER, CONVERT_TO_MANAGED, ConvertToManaged, SM_PtrByte_RetStr)
Expand Down
6 changes: 6 additions & 0 deletions src/coreclr/vm/jitinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6185,6 +6185,12 @@ CORINFO_CLASS_HANDLE CEEInfo::getTypeForBoxOnStack(CORINFO_CLASS_HANDLE cls)
TypeHandle stackAllocatedBox = CoreLibBinder::GetClass(CLASS__STACKALLOCATEDBOX);
TypeHandle stackAllocatedBoxInst = stackAllocatedBox.Instantiate(boxedFieldsInst);
result = static_cast<CORINFO_CLASS_HANDLE>(stackAllocatedBoxInst.AsPtr());

#ifdef _DEBUG
FieldDesc* pValueFD = CoreLibBinder::GetField(FIELD__STACKALLOCATEDBOX__VALUE);
DWORD index = pValueFD->GetApproxEnclosingMethodTable()->GetIndexForFieldDesc(pValueFD);
_ASSERTE(stackAllocatedBoxInst.GetMethodTable()->GetFieldDescByIndex(index)->GetOffset() == TARGET_POINTER_SIZE);
#endif
}

EE_TO_JIT_TRANSITION();
Expand Down
2 changes: 1 addition & 1 deletion ...libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/StackAllocatedBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
namespace System.Runtime.CompilerServices
{
[NonVersionable]
[StructLayout(LayoutKind.Sequential)]
[StructLayout(LayoutKind.Sequential, Pack = 1)]
internal unsafe struct StackAllocatedBox<T>
{
// These fields are only accessed from jitted code
Expand Down
Loading