Properly report TypedReference with ref fields.#72062

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
AaronRobinsonMSFT merged 3 commits into from
Jul 13, 2022
Merged

Properly report TypedReference with ref fields. #72062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a60fce
Update details about ELEMENT_TYPE_TYPEDBYREF
AaronRobinsonMSFT Jul 12, 2022
1e71fb5
Fix byref reporting in crossgen2
jkotas Jul 12, 2022
0703ddc
Update src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/Dependenc…
jkotas Jul 13, 2022
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: 1 addition & 3 deletions ...clr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ArgIterator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -248,7 +248,7 @@ public void Init()
};

// The ArgDestination class represents a destination location of an argument.
internal class ArgDestination
internal readonly struct ArgDestination
{
/// <summary>
/// Transition block context.
Expand DownExpand Up@@ -309,8 +309,6 @@ private int GetStructGenRegDestinationAddress()
// fieldBytes - size of the structure
internal void ReportPointersFromStructInRegisters(TypeDesc type, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
{
// SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

Debug.Assert(IsStructPassedInRegs());

int genRegDest = GetStructGenRegDestinationAddress();
Expand Down
58 changes: 19 additions & 39 deletions ...tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GCRefMapBuilder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
{
ArgLocDesc? argLocDescForStructInRegs = argit.GetArgLoc(argOffset);
ArgDestination argDest = new ArgDestination(_transitionBlock, argOffset, argLocDescForStructInRegs);
GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame);
GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame, topLevel: true);
argIndex++;
}
}
Expand All@@ -211,7 +211,8 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
/// <param name="type">Parameter type</param>
/// <param name="argDest">Location of the parameter</param>
/// <param name="frame">Frame map to update by marking GC locations</param>
Comment thread
jkotas marked this conversation as resolved.
private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
/// <param name="topLevel">Indicates if the call is for a type or inner member</param>
private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
{
switch (type.Category)
{
Expand DownExpand Up@@ -252,60 +253,39 @@ private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CO
// TYPE_GC_OTHER
case TypeFlags.ValueType:
case TypeFlags.Nullable:
GcScanValueType(type, argDest, delta, frame);
GcScanValueType(type, in argDest, delta, frame, topLevel);
break;

default:
throw new NotImplementedException();
}
}

private void GcScanValueType(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
private void GcScanValueType(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
{
if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
if (topLevel)
{
argDest.GcMark(frame, delta, interior: true);
return;
}
if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
{
argDest.GcMark(frame, delta, interior: true);
return;
}

// ReportPointersFromValueTypeArg
if (argDest.IsStructPassedInRegs())
{
argDest.ReportPointersFromStructInRegisters(type, delta, frame);
return;
}
// ReportPointersFromValueType
if (type.IsByRefLike)
{
FindByRefPointerOffsetsInByRefLikeObject(type, argDest, delta, frame);
if (argDest.IsStructPassedInRegs())
{
argDest.ReportPointersFromStructInRegisters(type, delta, frame);
return;
}
}

Debug.Assert(type is DefType);
DefType defType = (DefType)type;
foreach (FieldDesc field in defType.GetFields())
{
if (!field.IsStatic)
{
GcScanRoots(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
}
}
}
if (field.IsStatic)
continue;

private void FindByRefPointerOffsetsInByRefLikeObject(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
{
if (type.IsByRef)
{
argDest.GcMark(frame, delta, interior: true);
return;
}

foreach (FieldDesc field in type.GetFields())
{
if (!field.IsStatic && field.FieldType.IsByRefLike)
{
Debug.Assert(field.FieldType.IsValueType);
FindByRefPointerOffsetsInByRefLikeObject(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
}
GcScanRoots(field.FieldType, in argDest, delta + field.Offset.AsInt, frame, topLevel: false);
}
}

Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/vm/argdestination.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -278,8 +278,6 @@ class ArgDestination
{
LIMITED_METHOD_CONTRACT;

// SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

_ASSERTE(IsStructPassedInRegs());

TADDR genRegDest = dac_cast<TADDR>(GetStructGenRegDestinationAddress());
Expand Down
16 changes: 8 additions & 8 deletions src/coreclr/vm/methodtable.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2500,7 +2500,7 @@ bool MethodTable::ClassifyEightBytesWithNativeLayout(SystemVStructRegisterPassin

if ((strcmp(className, "Vector`1") == 0) && (strcmp(namespaceName, "System.Numerics") == 0))
{
LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithManagedLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithNativeLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
nestingLevel * 5, "", this->GetDebugClassName()));

return false;
Expand DownExpand Up@@ -5500,33 +5500,33 @@ namespace
for (; it.IsValid() && candidateMaybe == NULL; it.Next())
{
MethodDesc *pDeclMD = it.GetMethodDesc();

// Is this the right slot?
if (pDeclMD->GetSlot() != targetSlot)
continue;

// Is this the right interface?
if (!pDeclMD->HasSameMethodDefAs(interfaceMD))
continue;

if (interfaceMD->HasClassInstantiation())
{
// pInterfaceMD will be in the canonical form, so we need to check the specific
// instantiation against pInterfaceMT.
//
// The parent of pDeclMD is unreliable for this purpose because it may or
// may not be canonicalized. Let's go from the metadata.

SigTypeContext typeContext = SigTypeContext(pMT);

mdTypeRef tkParent;
IfFailThrow(pMD->GetModule()->GetMDImport()->GetParentToken(it.GetToken(), &tkParent));

MethodTable *pDeclMT = ClassLoader::LoadTypeDefOrRefOrSpecThrowing(
pMD->GetModule(),
tkParent,
&typeContext).AsMethodTable();

// We do CanCastToInterface to also cover variance.
// We already know this is a method on the same type definition as the (generic)
// interface but we need to make sure the instantiations match.
Expand Down
8 changes: 8 additions & 0 deletions src/coreclr/vm/methodtablebuilder.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8343,11 +8343,19 @@ void MethodTableBuilder::SystemVAmd64CheckForPassStructInRegister()
SystemVStructRegisterPassingHelper helper((unsigned int)totalStructSize);
if (GetHalfBakedMethodTable()->ClassifyEightBytes(&helper, 0, 0, useNativeLayout))
{
LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is enregisterable\n",
this->GetDebugClassName()));

// All the above tests passed. It's registers passed struct!
GetHalfBakedMethodTable()->SetRegPassedStruct();

StoreEightByteClassification(&helper);
}
else
{
LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is _not_ enregisterable\n",
this->GetDebugClassName()));
}
}

// Store the eightbyte classification into the EEClass
Expand Down
16 changes: 7 additions & 9 deletions src/coreclr/vm/siginfo.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,7 @@ DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_ARRAY, TARGET_POINTER_SIZE, TYPE_GC

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_GENERICINST, -1, TYPE_GC_OTHER, 0)

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_BYREF, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_OTHER, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_VALUEARRAY_UNSUPPORTED, -1, TYPE_GC_NONE, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_I, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_U, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
Expand All@@ -135,13 +135,6 @@ unsigned GetSizeForCorElementType(CorElementType etyp)
return gElementTypeInfo[etyp].m_cbSize;
}

const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp)
{
LIMITED_METHOD_CONTRACT;
_ASSERTE(gElementTypeInfo[etyp].m_elementType == etyp);
return &gElementTypeInfo[etyp];
}

#ifndef DACCESS_COMPILE

void SigPointer::ConvertToInternalExactlyOne(Module* pSigModule, SigTypeContext *pTypeContext, SigBuilder * pSigBuilder, BOOL bSkipCustomModifier)
Expand DownExpand Up@@ -2374,6 +2367,11 @@ CorElementType SigPointer::PeekElemTypeNormalized(Module* pModule, const SigType
*pthValueType = th;
}
}
else if (type == ELEMENT_TYPE_TYPEDBYREF)
{
if (pthValueType != NULL)
*pthValueType = TypeHandle(g_TypedReferenceMT);
}

return(type);
}
Expand DownExpand Up@@ -5120,7 +5118,7 @@ VOID MetaSig::GcScanRoots(ArgDestination *pValue,
// for value classes describes the state of the instance in its boxed
// state. Here we are dealing with an unboxed instance, so we must adjust
// the object size and series offsets appropriately.
_ASSERTE(etype == ELEMENT_TYPE_VALUETYPE);
_ASSERTE(etype == ELEMENT_TYPE_VALUETYPE || etype == ELEMENT_TYPE_TYPEDBYREF);
{
PTR_MethodTable pMT = thValueType.AsMethodTable();

Expand Down
1 change: 0 additions & 1 deletion src/coreclr/vm/siginfo.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ struct ElementTypeInfo {
extern const ElementTypeInfo gElementTypeInfo[];

unsigned GetSizeForCorElementType(CorElementType etyp);
const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp);

class SigBuilder;
class ArgDestination;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Properly report TypedReference with ref fields.#72062

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

AaronRobinsonMSFT
merged 3 commits into

from

Jul 13, 2022
 Merged


Properly report TypedReference with ref fields.
#72062
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8a60fce

Update details about ELEMENT_TYPE_TYPEDBYREF


AaronRobinsonMSFT Jul 12, 2022
1e71fb5

Fix byref reporting in crossgen2


jkotas Jul 12, 2022
0703ddc

Update src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/Dependenc…


jkotas Jul 13, 2022

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: 1 addition & 3 deletions
...clr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ArgIterator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -248,7 +248,7 @@ public void Init()
 };

 // The ArgDestination class represents a destination location of an argument.
 internal class ArgDestination
 internal readonly struct ArgDestination
 {
 /// <summary>
 /// Transition block context.
Expand DownExpand Up@@ -309,8 +309,6 @@ private int GetStructGenRegDestinationAddress()
 // fieldBytes - size of the structure
 internal void ReportPointersFromStructInRegisters(TypeDesc type, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 Debug.Assert(IsStructPassedInRegs());

 int genRegDest = GetStructGenRegDestinationAddress();
Expand Down

58 changes: 19 additions & 39 deletions
...tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GCRefMapBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 {
 ArgLocDesc? argLocDescForStructInRegs = argit.GetArgLoc(argOffset);
 ArgDestination argDest = new ArgDestination(_transitionBlock, argOffset, argLocDescForStructInRegs);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame, topLevel: true);
 argIndex++;
 }
 }
Expand All@@ -211,7 +211,8 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 /// <param name="type">Parameter type</param>
 /// <param name="argDest">Location of the parameter</param>
 /// <param name="frame">Frame map to update by marking GC locations</param>
Comment thread
jkotas marked this conversation as resolved.

 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 /// <param name="topLevel">Indicates if the call is for a type or inner member</param>
 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 switch (type.Category)
 {
Expand DownExpand Up@@ -252,60 +253,39 @@ private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CO
 // TYPE_GC_OTHER
 case TypeFlags.ValueType:
 case TypeFlags.Nullable:
 GcScanValueType(type, argDest, delta, frame);
 GcScanValueType(type, in argDest, delta, frame, topLevel);
 break;

 default:
 throw new NotImplementedException();
 }
 }

 private void GcScanValueType(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 private void GcScanValueType(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 if (topLevel)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 // ReportPointersFromValueTypeArg
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 // ReportPointersFromValueType
 if (type.IsByRefLike)
 {
 FindByRefPointerOffsetsInByRefLikeObject(type, argDest, delta, frame);
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 }

 Debug.Assert(type is DefType);
 DefType defType = (DefType)type;
 foreach (FieldDesc field in defType.GetFields())
 {
 if (!field.IsStatic)
 {
 GcScanRoots(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 }
 }
 if (field.IsStatic)
 continue;

 private void FindByRefPointerOffsetsInByRefLikeObject(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 if (type.IsByRef)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 foreach (FieldDesc field in type.GetFields())
 {
 if (!field.IsStatic && field.FieldType.IsByRefLike)
 {
 Debug.Assert(field.FieldType.IsValueType);
 FindByRefPointerOffsetsInByRefLikeObject(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 GcScanRoots(field.FieldType, in argDest, delta + field.Offset.AsInt, frame, topLevel: false);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/vm/argdestination.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,8 +278,6 @@ class ArgDestination
 {
 LIMITED_METHOD_CONTRACT;

 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 _ASSERTE(IsStructPassedInRegs());

 TADDR genRegDest = dac_cast<TADDR>(GetStructGenRegDestinationAddress());
Expand Down

16 changes: 8 additions & 8 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2500,7 +2500,7 @@ bool MethodTable::ClassifyEightBytesWithNativeLayout(SystemVStructRegisterPassin

 if ((strcmp(className, "Vector`1") == 0) && (strcmp(namespaceName, "System.Numerics") == 0))
 {
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithManagedLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithNativeLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 nestingLevel * 5, "", this->GetDebugClassName()));

 return false;
Expand DownExpand Up@@ -5500,33 +5500,33 @@ namespace
 for (; it.IsValid() && candidateMaybe == NULL; it.Next())
 {
 MethodDesc *pDeclMD = it.GetMethodDesc();

 // Is this the right slot?
 if (pDeclMD->GetSlot() != targetSlot)
 continue;

 // Is this the right interface?
 if (!pDeclMD->HasSameMethodDefAs(interfaceMD))
 continue;

 if (interfaceMD->HasClassInstantiation())
 {
 // pInterfaceMD will be in the canonical form, so we need to check the specific
 // instantiation against pInterfaceMT.
 //
 // The parent of pDeclMD is unreliable for this purpose because it may or
 // may not be canonicalized. Let's go from the metadata.

 SigTypeContext typeContext = SigTypeContext(pMT);

 mdTypeRef tkParent;
 IfFailThrow(pMD->GetModule()->GetMDImport()->GetParentToken(it.GetToken(), &tkParent));

 MethodTable *pDeclMT = ClassLoader::LoadTypeDefOrRefOrSpecThrowing(
 pMD->GetModule(),
 tkParent,
 &typeContext).AsMethodTable();

 // We do CanCastToInterface to also cover variance.
 // We already know this is a method on the same type definition as the (generic)
 // interface but we need to make sure the instantiations match.
Expand Down

8 changes: 8 additions & 0 deletions
src/coreclr/vm/methodtablebuilder.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8343,11 +8343,19 @@ void MethodTableBuilder::SystemVAmd64CheckForPassStructInRegister()
 SystemVStructRegisterPassingHelper helper((unsigned int)totalStructSize);
 if (GetHalfBakedMethodTable()->ClassifyEightBytes(&helper, 0, 0, useNativeLayout))
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is enregisterable\n",
 this->GetDebugClassName()));

 // All the above tests passed. It's registers passed struct!
 GetHalfBakedMethodTable()->SetRegPassedStruct();

 StoreEightByteClassification(&helper);
 }
 else
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is _not_ enregisterable\n",
 this->GetDebugClassName()));
 }
}

// Store the eightbyte classification into the EEClass
Expand Down

16 changes: 7 additions & 9 deletions
src/coreclr/vm/siginfo.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,7 @@ DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_ARRAY, TARGET_POINTER_SIZE, TYPE_GC

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_GENERICINST, -1, TYPE_GC_OTHER, 0)

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_BYREF, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_OTHER, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_VALUEARRAY_UNSUPPORTED, -1, TYPE_GC_NONE, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_I, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_U, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
Expand All@@ -135,13 +135,6 @@ unsigned GetSizeForCorElementType(CorElementType etyp)
 return gElementTypeInfo[etyp].m_cbSize;
}

const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp)
{
 LIMITED_METHOD_CONTRACT;
 _ASSERTE(gElementTypeInfo[etyp].m_elementType == etyp);
 return &gElementTypeInfo[etyp];
}

#ifndef DACCESS_COMPILE

void SigPointer::ConvertToInternalExactlyOne(Module* pSigModule, SigTypeContext *pTypeContext, SigBuilder * pSigBuilder, BOOL bSkipCustomModifier)
Expand DownExpand Up@@ -2374,6 +2367,11 @@ CorElementType SigPointer::PeekElemTypeNormalized(Module* pModule, const SigType
 *pthValueType = th;
 }
 }
 else if (type == ELEMENT_TYPE_TYPEDBYREF)
 {
 if (pthValueType != NULL)
 *pthValueType = TypeHandle(g_TypedReferenceMT);
 }

 return(type);
}
Expand DownExpand Up@@ -5120,7 +5118,7 @@ VOID MetaSig::GcScanRoots(ArgDestination *pValue,
 // for value classes describes the state of the instance in its boxed
 // state. Here we are dealing with an unboxed instance, so we must adjust
 // the object size and series offsets appropriately.
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE);
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE || etype == ELEMENT_TYPE_TYPEDBYREF);
 {
 PTR_MethodTable pMT = thValueType.AsMethodTable();

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/siginfo.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ struct ElementTypeInfo {
extern const ElementTypeInfo gElementTypeInfo[];

unsigned GetSizeForCorElementType(CorElementType etyp);
const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp);

class SigBuilder;
class ArgDestination;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Properly report TypedReference with ref fields.#72062

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

AaronRobinsonMSFT
merged 3 commits into

from

Jul 13, 2022
 Merged


Properly report TypedReference with ref fields.
#72062
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8a60fce

Update details about ELEMENT_TYPE_TYPEDBYREF


AaronRobinsonMSFT Jul 12, 2022
1e71fb5

Fix byref reporting in crossgen2


jkotas Jul 12, 2022
0703ddc

Update src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/Dependenc…


jkotas Jul 13, 2022

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: 1 addition & 3 deletions
...clr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ArgIterator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -248,7 +248,7 @@ public void Init()
 };

 // The ArgDestination class represents a destination location of an argument.
 internal class ArgDestination
 internal readonly struct ArgDestination
 {
 /// <summary>
 /// Transition block context.
Expand DownExpand Up@@ -309,8 +309,6 @@ private int GetStructGenRegDestinationAddress()
 // fieldBytes - size of the structure
 internal void ReportPointersFromStructInRegisters(TypeDesc type, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 Debug.Assert(IsStructPassedInRegs());

 int genRegDest = GetStructGenRegDestinationAddress();
Expand Down

58 changes: 19 additions & 39 deletions
...tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GCRefMapBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 {
 ArgLocDesc? argLocDescForStructInRegs = argit.GetArgLoc(argOffset);
 ArgDestination argDest = new ArgDestination(_transitionBlock, argOffset, argLocDescForStructInRegs);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame, topLevel: true);
 argIndex++;
 }
 }
Expand All@@ -211,7 +211,8 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 /// <param name="type">Parameter type</param>
 /// <param name="argDest">Location of the parameter</param>
 /// <param name="frame">Frame map to update by marking GC locations</param>
Comment thread
jkotas marked this conversation as resolved.

 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 /// <param name="topLevel">Indicates if the call is for a type or inner member</param>
 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 switch (type.Category)
 {
Expand DownExpand Up@@ -252,60 +253,39 @@ private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CO
 // TYPE_GC_OTHER
 case TypeFlags.ValueType:
 case TypeFlags.Nullable:
 GcScanValueType(type, argDest, delta, frame);
 GcScanValueType(type, in argDest, delta, frame, topLevel);
 break;

 default:
 throw new NotImplementedException();
 }
 }

 private void GcScanValueType(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 private void GcScanValueType(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 if (topLevel)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 // ReportPointersFromValueTypeArg
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 // ReportPointersFromValueType
 if (type.IsByRefLike)
 {
 FindByRefPointerOffsetsInByRefLikeObject(type, argDest, delta, frame);
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 }

 Debug.Assert(type is DefType);
 DefType defType = (DefType)type;
 foreach (FieldDesc field in defType.GetFields())
 {
 if (!field.IsStatic)
 {
 GcScanRoots(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 }
 }
 if (field.IsStatic)
 continue;

 private void FindByRefPointerOffsetsInByRefLikeObject(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 if (type.IsByRef)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 foreach (FieldDesc field in type.GetFields())
 {
 if (!field.IsStatic && field.FieldType.IsByRefLike)
 {
 Debug.Assert(field.FieldType.IsValueType);
 FindByRefPointerOffsetsInByRefLikeObject(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 GcScanRoots(field.FieldType, in argDest, delta + field.Offset.AsInt, frame, topLevel: false);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/vm/argdestination.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,8 +278,6 @@ class ArgDestination
 {
 LIMITED_METHOD_CONTRACT;

 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 _ASSERTE(IsStructPassedInRegs());

 TADDR genRegDest = dac_cast<TADDR>(GetStructGenRegDestinationAddress());
Expand Down

16 changes: 8 additions & 8 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2500,7 +2500,7 @@ bool MethodTable::ClassifyEightBytesWithNativeLayout(SystemVStructRegisterPassin

 if ((strcmp(className, "Vector`1") == 0) && (strcmp(namespaceName, "System.Numerics") == 0))
 {
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithManagedLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithNativeLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 nestingLevel * 5, "", this->GetDebugClassName()));

 return false;
Expand DownExpand Up@@ -5500,33 +5500,33 @@ namespace
 for (; it.IsValid() && candidateMaybe == NULL; it.Next())
 {
 MethodDesc *pDeclMD = it.GetMethodDesc();

 // Is this the right slot?
 if (pDeclMD->GetSlot() != targetSlot)
 continue;

 // Is this the right interface?
 if (!pDeclMD->HasSameMethodDefAs(interfaceMD))
 continue;

 if (interfaceMD->HasClassInstantiation())
 {
 // pInterfaceMD will be in the canonical form, so we need to check the specific
 // instantiation against pInterfaceMT.
 //
 // The parent of pDeclMD is unreliable for this purpose because it may or
 // may not be canonicalized. Let's go from the metadata.

 SigTypeContext typeContext = SigTypeContext(pMT);

 mdTypeRef tkParent;
 IfFailThrow(pMD->GetModule()->GetMDImport()->GetParentToken(it.GetToken(), &tkParent));

 MethodTable *pDeclMT = ClassLoader::LoadTypeDefOrRefOrSpecThrowing(
 pMD->GetModule(),
 tkParent,
 &typeContext).AsMethodTable();

 // We do CanCastToInterface to also cover variance.
 // We already know this is a method on the same type definition as the (generic)
 // interface but we need to make sure the instantiations match.
Expand Down

8 changes: 8 additions & 0 deletions
src/coreclr/vm/methodtablebuilder.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8343,11 +8343,19 @@ void MethodTableBuilder::SystemVAmd64CheckForPassStructInRegister()
 SystemVStructRegisterPassingHelper helper((unsigned int)totalStructSize);
 if (GetHalfBakedMethodTable()->ClassifyEightBytes(&helper, 0, 0, useNativeLayout))
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is enregisterable\n",
 this->GetDebugClassName()));

 // All the above tests passed. It's registers passed struct!
 GetHalfBakedMethodTable()->SetRegPassedStruct();

 StoreEightByteClassification(&helper);
 }
 else
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is _not_ enregisterable\n",
 this->GetDebugClassName()));
 }
}

// Store the eightbyte classification into the EEClass
Expand Down

16 changes: 7 additions & 9 deletions
src/coreclr/vm/siginfo.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,7 @@ DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_ARRAY, TARGET_POINTER_SIZE, TYPE_GC

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_GENERICINST, -1, TYPE_GC_OTHER, 0)

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_BYREF, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_OTHER, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_VALUEARRAY_UNSUPPORTED, -1, TYPE_GC_NONE, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_I, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_U, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
Expand All@@ -135,13 +135,6 @@ unsigned GetSizeForCorElementType(CorElementType etyp)
 return gElementTypeInfo[etyp].m_cbSize;
}

const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp)
{
 LIMITED_METHOD_CONTRACT;
 _ASSERTE(gElementTypeInfo[etyp].m_elementType == etyp);
 return &gElementTypeInfo[etyp];
}

#ifndef DACCESS_COMPILE

void SigPointer::ConvertToInternalExactlyOne(Module* pSigModule, SigTypeContext *pTypeContext, SigBuilder * pSigBuilder, BOOL bSkipCustomModifier)
Expand DownExpand Up@@ -2374,6 +2367,11 @@ CorElementType SigPointer::PeekElemTypeNormalized(Module* pModule, const SigType
 *pthValueType = th;
 }
 }
 else if (type == ELEMENT_TYPE_TYPEDBYREF)
 {
 if (pthValueType != NULL)
 *pthValueType = TypeHandle(g_TypedReferenceMT);
 }

 return(type);
}
Expand DownExpand Up@@ -5120,7 +5118,7 @@ VOID MetaSig::GcScanRoots(ArgDestination *pValue,
 // for value classes describes the state of the instance in its boxed
 // state. Here we are dealing with an unboxed instance, so we must adjust
 // the object size and series offsets appropriately.
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE);
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE || etype == ELEMENT_TYPE_TYPEDBYREF);
 {
 PTR_MethodTable pMT = thValueType.AsMethodTable();

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/siginfo.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ struct ElementTypeInfo {
extern const ElementTypeInfo gElementTypeInfo[];

unsigned GetSizeForCorElementType(CorElementType etyp);
const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp);

class SigBuilder;
class ArgDestination;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Properly report TypedReference with ref fields.#72062

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

AaronRobinsonMSFT
merged 3 commits into

from

Jul 13, 2022
 Merged


Properly report TypedReference with ref fields.
#72062
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8a60fce

Update details about ELEMENT_TYPE_TYPEDBYREF


AaronRobinsonMSFT Jul 12, 2022
1e71fb5

Fix byref reporting in crossgen2


jkotas Jul 12, 2022
0703ddc

Update src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/Dependenc…


jkotas Jul 13, 2022

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: 1 addition & 3 deletions
...clr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ArgIterator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -248,7 +248,7 @@ public void Init()
 };

 // The ArgDestination class represents a destination location of an argument.
 internal class ArgDestination
 internal readonly struct ArgDestination
 {
 /// <summary>
 /// Transition block context.
Expand DownExpand Up@@ -309,8 +309,6 @@ private int GetStructGenRegDestinationAddress()
 // fieldBytes - size of the structure
 internal void ReportPointersFromStructInRegisters(TypeDesc type, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 Debug.Assert(IsStructPassedInRegs());

 int genRegDest = GetStructGenRegDestinationAddress();
Expand Down

58 changes: 19 additions & 39 deletions
...tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GCRefMapBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 {
 ArgLocDesc? argLocDescForStructInRegs = argit.GetArgLoc(argOffset);
 ArgDestination argDest = new ArgDestination(_transitionBlock, argOffset, argLocDescForStructInRegs);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame, topLevel: true);
 argIndex++;
 }
 }
Expand All@@ -211,7 +211,8 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 /// <param name="type">Parameter type</param>
 /// <param name="argDest">Location of the parameter</param>
 /// <param name="frame">Frame map to update by marking GC locations</param>
Comment thread
jkotas marked this conversation as resolved.

 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 /// <param name="topLevel">Indicates if the call is for a type or inner member</param>
 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 switch (type.Category)
 {
Expand DownExpand Up@@ -252,60 +253,39 @@ private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CO
 // TYPE_GC_OTHER
 case TypeFlags.ValueType:
 case TypeFlags.Nullable:
 GcScanValueType(type, argDest, delta, frame);
 GcScanValueType(type, in argDest, delta, frame, topLevel);
 break;

 default:
 throw new NotImplementedException();
 }
 }

 private void GcScanValueType(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 private void GcScanValueType(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 if (topLevel)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 // ReportPointersFromValueTypeArg
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 // ReportPointersFromValueType
 if (type.IsByRefLike)
 {
 FindByRefPointerOffsetsInByRefLikeObject(type, argDest, delta, frame);
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 }

 Debug.Assert(type is DefType);
 DefType defType = (DefType)type;
 foreach (FieldDesc field in defType.GetFields())
 {
 if (!field.IsStatic)
 {
 GcScanRoots(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 }
 }
 if (field.IsStatic)
 continue;

 private void FindByRefPointerOffsetsInByRefLikeObject(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 if (type.IsByRef)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 foreach (FieldDesc field in type.GetFields())
 {
 if (!field.IsStatic && field.FieldType.IsByRefLike)
 {
 Debug.Assert(field.FieldType.IsValueType);
 FindByRefPointerOffsetsInByRefLikeObject(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 GcScanRoots(field.FieldType, in argDest, delta + field.Offset.AsInt, frame, topLevel: false);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/vm/argdestination.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,8 +278,6 @@ class ArgDestination
 {
 LIMITED_METHOD_CONTRACT;

 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 _ASSERTE(IsStructPassedInRegs());

 TADDR genRegDest = dac_cast<TADDR>(GetStructGenRegDestinationAddress());
Expand Down

16 changes: 8 additions & 8 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2500,7 +2500,7 @@ bool MethodTable::ClassifyEightBytesWithNativeLayout(SystemVStructRegisterPassin

 if ((strcmp(className, "Vector`1") == 0) && (strcmp(namespaceName, "System.Numerics") == 0))
 {
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithManagedLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithNativeLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 nestingLevel * 5, "", this->GetDebugClassName()));

 return false;
Expand DownExpand Up@@ -5500,33 +5500,33 @@ namespace
 for (; it.IsValid() && candidateMaybe == NULL; it.Next())
 {
 MethodDesc *pDeclMD = it.GetMethodDesc();

 // Is this the right slot?
 if (pDeclMD->GetSlot() != targetSlot)
 continue;

 // Is this the right interface?
 if (!pDeclMD->HasSameMethodDefAs(interfaceMD))
 continue;

 if (interfaceMD->HasClassInstantiation())
 {
 // pInterfaceMD will be in the canonical form, so we need to check the specific
 // instantiation against pInterfaceMT.
 //
 // The parent of pDeclMD is unreliable for this purpose because it may or
 // may not be canonicalized. Let's go from the metadata.

 SigTypeContext typeContext = SigTypeContext(pMT);

 mdTypeRef tkParent;
 IfFailThrow(pMD->GetModule()->GetMDImport()->GetParentToken(it.GetToken(), &tkParent));

 MethodTable *pDeclMT = ClassLoader::LoadTypeDefOrRefOrSpecThrowing(
 pMD->GetModule(),
 tkParent,
 &typeContext).AsMethodTable();

 // We do CanCastToInterface to also cover variance.
 // We already know this is a method on the same type definition as the (generic)
 // interface but we need to make sure the instantiations match.
Expand Down

8 changes: 8 additions & 0 deletions
src/coreclr/vm/methodtablebuilder.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8343,11 +8343,19 @@ void MethodTableBuilder::SystemVAmd64CheckForPassStructInRegister()
 SystemVStructRegisterPassingHelper helper((unsigned int)totalStructSize);
 if (GetHalfBakedMethodTable()->ClassifyEightBytes(&helper, 0, 0, useNativeLayout))
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is enregisterable\n",
 this->GetDebugClassName()));

 // All the above tests passed. It's registers passed struct!
 GetHalfBakedMethodTable()->SetRegPassedStruct();

 StoreEightByteClassification(&helper);
 }
 else
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is _not_ enregisterable\n",
 this->GetDebugClassName()));
 }
}

// Store the eightbyte classification into the EEClass
Expand Down

16 changes: 7 additions & 9 deletions
src/coreclr/vm/siginfo.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,7 @@ DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_ARRAY, TARGET_POINTER_SIZE, TYPE_GC

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_GENERICINST, -1, TYPE_GC_OTHER, 0)

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_BYREF, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_OTHER, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_VALUEARRAY_UNSUPPORTED, -1, TYPE_GC_NONE, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_I, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_U, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
Expand All@@ -135,13 +135,6 @@ unsigned GetSizeForCorElementType(CorElementType etyp)
 return gElementTypeInfo[etyp].m_cbSize;
}

const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp)
{
 LIMITED_METHOD_CONTRACT;
 _ASSERTE(gElementTypeInfo[etyp].m_elementType == etyp);
 return &gElementTypeInfo[etyp];
}

#ifndef DACCESS_COMPILE

void SigPointer::ConvertToInternalExactlyOne(Module* pSigModule, SigTypeContext *pTypeContext, SigBuilder * pSigBuilder, BOOL bSkipCustomModifier)
Expand DownExpand Up@@ -2374,6 +2367,11 @@ CorElementType SigPointer::PeekElemTypeNormalized(Module* pModule, const SigType
 *pthValueType = th;
 }
 }
 else if (type == ELEMENT_TYPE_TYPEDBYREF)
 {
 if (pthValueType != NULL)
 *pthValueType = TypeHandle(g_TypedReferenceMT);
 }

 return(type);
}
Expand DownExpand Up@@ -5120,7 +5118,7 @@ VOID MetaSig::GcScanRoots(ArgDestination *pValue,
 // for value classes describes the state of the instance in its boxed
 // state. Here we are dealing with an unboxed instance, so we must adjust
 // the object size and series offsets appropriately.
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE);
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE || etype == ELEMENT_TYPE_TYPEDBYREF);
 {
 PTR_MethodTable pMT = thValueType.AsMethodTable();

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/siginfo.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ struct ElementTypeInfo {
extern const ElementTypeInfo gElementTypeInfo[];

unsigned GetSizeForCorElementType(CorElementType etyp);
const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp);

class SigBuilder;
class ArgDestination;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Properly report TypedReference with ref fields.#72062

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

AaronRobinsonMSFT
merged 3 commits into

from

Jul 13, 2022
 Merged


Properly report TypedReference with ref fields.
#72062
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8a60fce

Update details about ELEMENT_TYPE_TYPEDBYREF


AaronRobinsonMSFT Jul 12, 2022
1e71fb5

Fix byref reporting in crossgen2


jkotas Jul 12, 2022
0703ddc

Update src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/Dependenc…


jkotas Jul 13, 2022

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: 1 addition & 3 deletions
...clr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ArgIterator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -248,7 +248,7 @@ public void Init()
 };

 // The ArgDestination class represents a destination location of an argument.
 internal class ArgDestination
 internal readonly struct ArgDestination
 {
 /// <summary>
 /// Transition block context.
Expand DownExpand Up@@ -309,8 +309,6 @@ private int GetStructGenRegDestinationAddress()
 // fieldBytes - size of the structure
 internal void ReportPointersFromStructInRegisters(TypeDesc type, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 Debug.Assert(IsStructPassedInRegs());

 int genRegDest = GetStructGenRegDestinationAddress();
Expand Down

58 changes: 19 additions & 39 deletions
...tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GCRefMapBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 {
 ArgLocDesc? argLocDescForStructInRegs = argit.GetArgLoc(argOffset);
 ArgDestination argDest = new ArgDestination(_transitionBlock, argOffset, argLocDescForStructInRegs);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame, topLevel: true);
 argIndex++;
 }
 }
Expand All@@ -211,7 +211,8 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 /// <param name="type">Parameter type</param>
 /// <param name="argDest">Location of the parameter</param>
 /// <param name="frame">Frame map to update by marking GC locations</param>
Comment thread
jkotas marked this conversation as resolved.

 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 /// <param name="topLevel">Indicates if the call is for a type or inner member</param>
 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 switch (type.Category)
 {
Expand DownExpand Up@@ -252,60 +253,39 @@ private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CO
 // TYPE_GC_OTHER
 case TypeFlags.ValueType:
 case TypeFlags.Nullable:
 GcScanValueType(type, argDest, delta, frame);
 GcScanValueType(type, in argDest, delta, frame, topLevel);
 break;

 default:
 throw new NotImplementedException();
 }
 }

 private void GcScanValueType(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 private void GcScanValueType(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 if (topLevel)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 // ReportPointersFromValueTypeArg
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 // ReportPointersFromValueType
 if (type.IsByRefLike)
 {
 FindByRefPointerOffsetsInByRefLikeObject(type, argDest, delta, frame);
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 }

 Debug.Assert(type is DefType);
 DefType defType = (DefType)type;
 foreach (FieldDesc field in defType.GetFields())
 {
 if (!field.IsStatic)
 {
 GcScanRoots(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 }
 }
 if (field.IsStatic)
 continue;

 private void FindByRefPointerOffsetsInByRefLikeObject(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 if (type.IsByRef)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 foreach (FieldDesc field in type.GetFields())
 {
 if (!field.IsStatic && field.FieldType.IsByRefLike)
 {
 Debug.Assert(field.FieldType.IsValueType);
 FindByRefPointerOffsetsInByRefLikeObject(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 GcScanRoots(field.FieldType, in argDest, delta + field.Offset.AsInt, frame, topLevel: false);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/vm/argdestination.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,8 +278,6 @@ class ArgDestination
 {
 LIMITED_METHOD_CONTRACT;

 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 _ASSERTE(IsStructPassedInRegs());

 TADDR genRegDest = dac_cast<TADDR>(GetStructGenRegDestinationAddress());
Expand Down

16 changes: 8 additions & 8 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2500,7 +2500,7 @@ bool MethodTable::ClassifyEightBytesWithNativeLayout(SystemVStructRegisterPassin

 if ((strcmp(className, "Vector`1") == 0) && (strcmp(namespaceName, "System.Numerics") == 0))
 {
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithManagedLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithNativeLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 nestingLevel * 5, "", this->GetDebugClassName()));

 return false;
Expand DownExpand Up@@ -5500,33 +5500,33 @@ namespace
 for (; it.IsValid() && candidateMaybe == NULL; it.Next())
 {
 MethodDesc *pDeclMD = it.GetMethodDesc();

 // Is this the right slot?
 if (pDeclMD->GetSlot() != targetSlot)
 continue;

 // Is this the right interface?
 if (!pDeclMD->HasSameMethodDefAs(interfaceMD))
 continue;

 if (interfaceMD->HasClassInstantiation())
 {
 // pInterfaceMD will be in the canonical form, so we need to check the specific
 // instantiation against pInterfaceMT.
 //
 // The parent of pDeclMD is unreliable for this purpose because it may or
 // may not be canonicalized. Let's go from the metadata.

 SigTypeContext typeContext = SigTypeContext(pMT);

 mdTypeRef tkParent;
 IfFailThrow(pMD->GetModule()->GetMDImport()->GetParentToken(it.GetToken(), &tkParent));

 MethodTable *pDeclMT = ClassLoader::LoadTypeDefOrRefOrSpecThrowing(
 pMD->GetModule(),
 tkParent,
 &typeContext).AsMethodTable();

 // We do CanCastToInterface to also cover variance.
 // We already know this is a method on the same type definition as the (generic)
 // interface but we need to make sure the instantiations match.
Expand Down

8 changes: 8 additions & 0 deletions
src/coreclr/vm/methodtablebuilder.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8343,11 +8343,19 @@ void MethodTableBuilder::SystemVAmd64CheckForPassStructInRegister()
 SystemVStructRegisterPassingHelper helper((unsigned int)totalStructSize);
 if (GetHalfBakedMethodTable()->ClassifyEightBytes(&helper, 0, 0, useNativeLayout))
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is enregisterable\n",
 this->GetDebugClassName()));

 // All the above tests passed. It's registers passed struct!
 GetHalfBakedMethodTable()->SetRegPassedStruct();

 StoreEightByteClassification(&helper);
 }
 else
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is _not_ enregisterable\n",
 this->GetDebugClassName()));
 }
}

// Store the eightbyte classification into the EEClass
Expand Down

16 changes: 7 additions & 9 deletions
src/coreclr/vm/siginfo.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,7 @@ DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_ARRAY, TARGET_POINTER_SIZE, TYPE_GC

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_GENERICINST, -1, TYPE_GC_OTHER, 0)

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_BYREF, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_OTHER, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_VALUEARRAY_UNSUPPORTED, -1, TYPE_GC_NONE, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_I, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_U, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
Expand All@@ -135,13 +135,6 @@ unsigned GetSizeForCorElementType(CorElementType etyp)
 return gElementTypeInfo[etyp].m_cbSize;
}

const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp)
{
 LIMITED_METHOD_CONTRACT;
 _ASSERTE(gElementTypeInfo[etyp].m_elementType == etyp);
 return &gElementTypeInfo[etyp];
}

#ifndef DACCESS_COMPILE

void SigPointer::ConvertToInternalExactlyOne(Module* pSigModule, SigTypeContext *pTypeContext, SigBuilder * pSigBuilder, BOOL bSkipCustomModifier)
Expand DownExpand Up@@ -2374,6 +2367,11 @@ CorElementType SigPointer::PeekElemTypeNormalized(Module* pModule, const SigType
 *pthValueType = th;
 }
 }
 else if (type == ELEMENT_TYPE_TYPEDBYREF)
 {
 if (pthValueType != NULL)
 *pthValueType = TypeHandle(g_TypedReferenceMT);
 }

 return(type);
}
Expand DownExpand Up@@ -5120,7 +5118,7 @@ VOID MetaSig::GcScanRoots(ArgDestination *pValue,
 // for value classes describes the state of the instance in its boxed
 // state. Here we are dealing with an unboxed instance, so we must adjust
 // the object size and series offsets appropriately.
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE);
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE || etype == ELEMENT_TYPE_TYPEDBYREF);
 {
 PTR_MethodTable pMT = thValueType.AsMethodTable();

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/siginfo.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ struct ElementTypeInfo {
extern const ElementTypeInfo gElementTypeInfo[];

unsigned GetSizeForCorElementType(CorElementType etyp);
const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp);

class SigBuilder;
class ArgDestination;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Properly report TypedReference with ref fields.#72062

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

AaronRobinsonMSFT
merged 3 commits into

from

Jul 13, 2022
 Merged


Properly report TypedReference with ref fields.
#72062
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8a60fce

Update details about ELEMENT_TYPE_TYPEDBYREF


AaronRobinsonMSFT Jul 12, 2022
1e71fb5

Fix byref reporting in crossgen2


jkotas Jul 12, 2022
0703ddc

Update src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/Dependenc…


jkotas Jul 13, 2022

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: 1 addition & 3 deletions
...clr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ArgIterator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -248,7 +248,7 @@ public void Init()
 };

 // The ArgDestination class represents a destination location of an argument.
 internal class ArgDestination
 internal readonly struct ArgDestination
 {
 /// <summary>
 /// Transition block context.
Expand DownExpand Up@@ -309,8 +309,6 @@ private int GetStructGenRegDestinationAddress()
 // fieldBytes - size of the structure
 internal void ReportPointersFromStructInRegisters(TypeDesc type, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 Debug.Assert(IsStructPassedInRegs());

 int genRegDest = GetStructGenRegDestinationAddress();
Expand Down

58 changes: 19 additions & 39 deletions
...tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GCRefMapBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 {
 ArgLocDesc? argLocDescForStructInRegs = argit.GetArgLoc(argOffset);
 ArgDestination argDest = new ArgDestination(_transitionBlock, argOffset, argLocDescForStructInRegs);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame, topLevel: true);
 argIndex++;
 }
 }
Expand All@@ -211,7 +211,8 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 /// <param name="type">Parameter type</param>
 /// <param name="argDest">Location of the parameter</param>
 /// <param name="frame">Frame map to update by marking GC locations</param>
Comment thread
jkotas marked this conversation as resolved.

 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 /// <param name="topLevel">Indicates if the call is for a type or inner member</param>
 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 switch (type.Category)
 {
Expand DownExpand Up@@ -252,60 +253,39 @@ private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CO
 // TYPE_GC_OTHER
 case TypeFlags.ValueType:
 case TypeFlags.Nullable:
 GcScanValueType(type, argDest, delta, frame);
 GcScanValueType(type, in argDest, delta, frame, topLevel);
 break;

 default:
 throw new NotImplementedException();
 }
 }

 private void GcScanValueType(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 private void GcScanValueType(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 if (topLevel)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 // ReportPointersFromValueTypeArg
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 // ReportPointersFromValueType
 if (type.IsByRefLike)
 {
 FindByRefPointerOffsetsInByRefLikeObject(type, argDest, delta, frame);
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 }

 Debug.Assert(type is DefType);
 DefType defType = (DefType)type;
 foreach (FieldDesc field in defType.GetFields())
 {
 if (!field.IsStatic)
 {
 GcScanRoots(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 }
 }
 if (field.IsStatic)
 continue;

 private void FindByRefPointerOffsetsInByRefLikeObject(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 if (type.IsByRef)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 foreach (FieldDesc field in type.GetFields())
 {
 if (!field.IsStatic && field.FieldType.IsByRefLike)
 {
 Debug.Assert(field.FieldType.IsValueType);
 FindByRefPointerOffsetsInByRefLikeObject(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 GcScanRoots(field.FieldType, in argDest, delta + field.Offset.AsInt, frame, topLevel: false);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/vm/argdestination.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,8 +278,6 @@ class ArgDestination
 {
 LIMITED_METHOD_CONTRACT;

 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 _ASSERTE(IsStructPassedInRegs());

 TADDR genRegDest = dac_cast<TADDR>(GetStructGenRegDestinationAddress());
Expand Down

16 changes: 8 additions & 8 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2500,7 +2500,7 @@ bool MethodTable::ClassifyEightBytesWithNativeLayout(SystemVStructRegisterPassin

 if ((strcmp(className, "Vector`1") == 0) && (strcmp(namespaceName, "System.Numerics") == 0))
 {
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithManagedLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithNativeLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 nestingLevel * 5, "", this->GetDebugClassName()));

 return false;
Expand DownExpand Up@@ -5500,33 +5500,33 @@ namespace
 for (; it.IsValid() && candidateMaybe == NULL; it.Next())
 {
 MethodDesc *pDeclMD = it.GetMethodDesc();

 // Is this the right slot?
 if (pDeclMD->GetSlot() != targetSlot)
 continue;

 // Is this the right interface?
 if (!pDeclMD->HasSameMethodDefAs(interfaceMD))
 continue;

 if (interfaceMD->HasClassInstantiation())
 {
 // pInterfaceMD will be in the canonical form, so we need to check the specific
 // instantiation against pInterfaceMT.
 //
 // The parent of pDeclMD is unreliable for this purpose because it may or
 // may not be canonicalized. Let's go from the metadata.

 SigTypeContext typeContext = SigTypeContext(pMT);

 mdTypeRef tkParent;
 IfFailThrow(pMD->GetModule()->GetMDImport()->GetParentToken(it.GetToken(), &tkParent));

 MethodTable *pDeclMT = ClassLoader::LoadTypeDefOrRefOrSpecThrowing(
 pMD->GetModule(),
 tkParent,
 &typeContext).AsMethodTable();

 // We do CanCastToInterface to also cover variance.
 // We already know this is a method on the same type definition as the (generic)
 // interface but we need to make sure the instantiations match.
Expand Down

8 changes: 8 additions & 0 deletions
src/coreclr/vm/methodtablebuilder.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8343,11 +8343,19 @@ void MethodTableBuilder::SystemVAmd64CheckForPassStructInRegister()
 SystemVStructRegisterPassingHelper helper((unsigned int)totalStructSize);
 if (GetHalfBakedMethodTable()->ClassifyEightBytes(&helper, 0, 0, useNativeLayout))
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is enregisterable\n",
 this->GetDebugClassName()));

 // All the above tests passed. It's registers passed struct!
 GetHalfBakedMethodTable()->SetRegPassedStruct();

 StoreEightByteClassification(&helper);
 }
 else
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is _not_ enregisterable\n",
 this->GetDebugClassName()));
 }
}

// Store the eightbyte classification into the EEClass
Expand Down

16 changes: 7 additions & 9 deletions
src/coreclr/vm/siginfo.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,7 @@ DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_ARRAY, TARGET_POINTER_SIZE, TYPE_GC

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_GENERICINST, -1, TYPE_GC_OTHER, 0)

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_BYREF, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_OTHER, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_VALUEARRAY_UNSUPPORTED, -1, TYPE_GC_NONE, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_I, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_U, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
Expand All@@ -135,13 +135,6 @@ unsigned GetSizeForCorElementType(CorElementType etyp)
 return gElementTypeInfo[etyp].m_cbSize;
}

const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp)
{
 LIMITED_METHOD_CONTRACT;
 _ASSERTE(gElementTypeInfo[etyp].m_elementType == etyp);
 return &gElementTypeInfo[etyp];
}

#ifndef DACCESS_COMPILE

void SigPointer::ConvertToInternalExactlyOne(Module* pSigModule, SigTypeContext *pTypeContext, SigBuilder * pSigBuilder, BOOL bSkipCustomModifier)
Expand DownExpand Up@@ -2374,6 +2367,11 @@ CorElementType SigPointer::PeekElemTypeNormalized(Module* pModule, const SigType
 *pthValueType = th;
 }
 }
 else if (type == ELEMENT_TYPE_TYPEDBYREF)
 {
 if (pthValueType != NULL)
 *pthValueType = TypeHandle(g_TypedReferenceMT);
 }

 return(type);
}
Expand DownExpand Up@@ -5120,7 +5118,7 @@ VOID MetaSig::GcScanRoots(ArgDestination *pValue,
 // for value classes describes the state of the instance in its boxed
 // state. Here we are dealing with an unboxed instance, so we must adjust
 // the object size and series offsets appropriately.
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE);
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE || etype == ELEMENT_TYPE_TYPEDBYREF);
 {
 PTR_MethodTable pMT = thValueType.AsMethodTable();

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/siginfo.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ struct ElementTypeInfo {
extern const ElementTypeInfo gElementTypeInfo[];

unsigned GetSizeForCorElementType(CorElementType etyp);
const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp);

class SigBuilder;
class ArgDestination;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Properly report TypedReference with ref fields.#72062

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

AaronRobinsonMSFT
merged 3 commits into

from

Jul 13, 2022
 Merged


Properly report TypedReference with ref fields.
#72062
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8a60fce

Update details about ELEMENT_TYPE_TYPEDBYREF


AaronRobinsonMSFT Jul 12, 2022
1e71fb5

Fix byref reporting in crossgen2


jkotas Jul 12, 2022
0703ddc

Update src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/Dependenc…


jkotas Jul 13, 2022

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: 1 addition & 3 deletions
...clr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ArgIterator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -248,7 +248,7 @@ public void Init()
 };

 // The ArgDestination class represents a destination location of an argument.
 internal class ArgDestination
 internal readonly struct ArgDestination
 {
 /// <summary>
 /// Transition block context.
Expand DownExpand Up@@ -309,8 +309,6 @@ private int GetStructGenRegDestinationAddress()
 // fieldBytes - size of the structure
 internal void ReportPointersFromStructInRegisters(TypeDesc type, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 Debug.Assert(IsStructPassedInRegs());

 int genRegDest = GetStructGenRegDestinationAddress();
Expand Down

58 changes: 19 additions & 39 deletions
...tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GCRefMapBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 {
 ArgLocDesc? argLocDescForStructInRegs = argit.GetArgLoc(argOffset);
 ArgDestination argDest = new ArgDestination(_transitionBlock, argOffset, argLocDescForStructInRegs);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame, topLevel: true);
 argIndex++;
 }
 }
Expand All@@ -211,7 +211,8 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 /// <param name="type">Parameter type</param>
 /// <param name="argDest">Location of the parameter</param>
 /// <param name="frame">Frame map to update by marking GC locations</param>
Comment thread
jkotas marked this conversation as resolved.

 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 /// <param name="topLevel">Indicates if the call is for a type or inner member</param>
 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 switch (type.Category)
 {
Expand DownExpand Up@@ -252,60 +253,39 @@ private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CO
 // TYPE_GC_OTHER
 case TypeFlags.ValueType:
 case TypeFlags.Nullable:
 GcScanValueType(type, argDest, delta, frame);
 GcScanValueType(type, in argDest, delta, frame, topLevel);
 break;

 default:
 throw new NotImplementedException();
 }
 }

 private void GcScanValueType(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 private void GcScanValueType(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 if (topLevel)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 // ReportPointersFromValueTypeArg
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 // ReportPointersFromValueType
 if (type.IsByRefLike)
 {
 FindByRefPointerOffsetsInByRefLikeObject(type, argDest, delta, frame);
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 }

 Debug.Assert(type is DefType);
 DefType defType = (DefType)type;
 foreach (FieldDesc field in defType.GetFields())
 {
 if (!field.IsStatic)
 {
 GcScanRoots(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 }
 }
 if (field.IsStatic)
 continue;

 private void FindByRefPointerOffsetsInByRefLikeObject(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 if (type.IsByRef)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 foreach (FieldDesc field in type.GetFields())
 {
 if (!field.IsStatic && field.FieldType.IsByRefLike)
 {
 Debug.Assert(field.FieldType.IsValueType);
 FindByRefPointerOffsetsInByRefLikeObject(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 GcScanRoots(field.FieldType, in argDest, delta + field.Offset.AsInt, frame, topLevel: false);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/vm/argdestination.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,8 +278,6 @@ class ArgDestination
 {
 LIMITED_METHOD_CONTRACT;

 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 _ASSERTE(IsStructPassedInRegs());

 TADDR genRegDest = dac_cast<TADDR>(GetStructGenRegDestinationAddress());
Expand Down

16 changes: 8 additions & 8 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2500,7 +2500,7 @@ bool MethodTable::ClassifyEightBytesWithNativeLayout(SystemVStructRegisterPassin

 if ((strcmp(className, "Vector`1") == 0) && (strcmp(namespaceName, "System.Numerics") == 0))
 {
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithManagedLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithNativeLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 nestingLevel * 5, "", this->GetDebugClassName()));

 return false;
Expand DownExpand Up@@ -5500,33 +5500,33 @@ namespace
 for (; it.IsValid() && candidateMaybe == NULL; it.Next())
 {
 MethodDesc *pDeclMD = it.GetMethodDesc();

 // Is this the right slot?
 if (pDeclMD->GetSlot() != targetSlot)
 continue;

 // Is this the right interface?
 if (!pDeclMD->HasSameMethodDefAs(interfaceMD))
 continue;

 if (interfaceMD->HasClassInstantiation())
 {
 // pInterfaceMD will be in the canonical form, so we need to check the specific
 // instantiation against pInterfaceMT.
 //
 // The parent of pDeclMD is unreliable for this purpose because it may or
 // may not be canonicalized. Let's go from the metadata.

 SigTypeContext typeContext = SigTypeContext(pMT);

 mdTypeRef tkParent;
 IfFailThrow(pMD->GetModule()->GetMDImport()->GetParentToken(it.GetToken(), &tkParent));

 MethodTable *pDeclMT = ClassLoader::LoadTypeDefOrRefOrSpecThrowing(
 pMD->GetModule(),
 tkParent,
 &typeContext).AsMethodTable();

 // We do CanCastToInterface to also cover variance.
 // We already know this is a method on the same type definition as the (generic)
 // interface but we need to make sure the instantiations match.
Expand Down

8 changes: 8 additions & 0 deletions
src/coreclr/vm/methodtablebuilder.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8343,11 +8343,19 @@ void MethodTableBuilder::SystemVAmd64CheckForPassStructInRegister()
 SystemVStructRegisterPassingHelper helper((unsigned int)totalStructSize);
 if (GetHalfBakedMethodTable()->ClassifyEightBytes(&helper, 0, 0, useNativeLayout))
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is enregisterable\n",
 this->GetDebugClassName()));

 // All the above tests passed. It's registers passed struct!
 GetHalfBakedMethodTable()->SetRegPassedStruct();

 StoreEightByteClassification(&helper);
 }
 else
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is _not_ enregisterable\n",
 this->GetDebugClassName()));
 }
}

// Store the eightbyte classification into the EEClass
Expand Down

16 changes: 7 additions & 9 deletions
src/coreclr/vm/siginfo.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,7 @@ DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_ARRAY, TARGET_POINTER_SIZE, TYPE_GC

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_GENERICINST, -1, TYPE_GC_OTHER, 0)

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_BYREF, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_OTHER, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_VALUEARRAY_UNSUPPORTED, -1, TYPE_GC_NONE, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_I, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_U, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
Expand All@@ -135,13 +135,6 @@ unsigned GetSizeForCorElementType(CorElementType etyp)
 return gElementTypeInfo[etyp].m_cbSize;
}

const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp)
{
 LIMITED_METHOD_CONTRACT;
 _ASSERTE(gElementTypeInfo[etyp].m_elementType == etyp);
 return &gElementTypeInfo[etyp];
}

#ifndef DACCESS_COMPILE

void SigPointer::ConvertToInternalExactlyOne(Module* pSigModule, SigTypeContext *pTypeContext, SigBuilder * pSigBuilder, BOOL bSkipCustomModifier)
Expand DownExpand Up@@ -2374,6 +2367,11 @@ CorElementType SigPointer::PeekElemTypeNormalized(Module* pModule, const SigType
 *pthValueType = th;
 }
 }
 else if (type == ELEMENT_TYPE_TYPEDBYREF)
 {
 if (pthValueType != NULL)
 *pthValueType = TypeHandle(g_TypedReferenceMT);
 }

 return(type);
}
Expand DownExpand Up@@ -5120,7 +5118,7 @@ VOID MetaSig::GcScanRoots(ArgDestination *pValue,
 // for value classes describes the state of the instance in its boxed
 // state. Here we are dealing with an unboxed instance, so we must adjust
 // the object size and series offsets appropriately.
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE);
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE || etype == ELEMENT_TYPE_TYPEDBYREF);
 {
 PTR_MethodTable pMT = thValueType.AsMethodTable();

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/siginfo.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ struct ElementTypeInfo {
extern const ElementTypeInfo gElementTypeInfo[];

unsigned GetSizeForCorElementType(CorElementType etyp);
const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp);

class SigBuilder;
class ArgDestination;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Properly report TypedReference with ref fields.#72062

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

AaronRobinsonMSFT
merged 3 commits into

from

Jul 13, 2022
 Merged


Properly report TypedReference with ref fields.
#72062
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
8a60fce

Update details about ELEMENT_TYPE_TYPEDBYREF


AaronRobinsonMSFT Jul 12, 2022
1e71fb5

Fix byref reporting in crossgen2


jkotas Jul 12, 2022
0703ddc

Update src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/Dependenc…


jkotas Jul 13, 2022

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: 1 addition & 3 deletions
...clr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ArgIterator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -248,7 +248,7 @@ public void Init()
 };

 // The ArgDestination class represents a destination location of an argument.
 internal class ArgDestination
 internal readonly struct ArgDestination
 {
 /// <summary>
 /// Transition block context.
Expand DownExpand Up@@ -309,8 +309,6 @@ private int GetStructGenRegDestinationAddress()
 // fieldBytes - size of the structure
 internal void ReportPointersFromStructInRegisters(TypeDesc type, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 Debug.Assert(IsStructPassedInRegs());

 int genRegDest = GetStructGenRegDestinationAddress();
Expand Down

58 changes: 19 additions & 39 deletions
...tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GCRefMapBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,7 +199,7 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 {
 ArgLocDesc? argLocDescForStructInRegs = argit.GetArgLoc(argOffset);
 ArgDestination argDest = new ArgDestination(_transitionBlock, argOffset, argLocDescForStructInRegs);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame);
 GcScanRoots(method.Signature[argIndex], in argDest, delta: 0, frame, topLevel: true);
 argIndex++;
 }
 }
Expand All@@ -211,7 +211,8 @@ private void FakeGcScanRoots(MethodDesc method, ArgIterator argit, CORCOMPILE_GC
 /// <param name="type">Parameter type</param>
 /// <param name="argDest">Location of the parameter</param>
 /// <param name="frame">Frame map to update by marking GC locations</param>
Comment thread
jkotas marked this conversation as resolved.

 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 /// <param name="topLevel">Indicates if the call is for a type or inner member</param>
 private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 switch (type.Category)
 {
Expand DownExpand Up@@ -252,60 +253,39 @@ private void GcScanRoots(TypeDesc type, in ArgDestination argDest, int delta, CO
 // TYPE_GC_OTHER
 case TypeFlags.ValueType:
 case TypeFlags.Nullable:
 GcScanValueType(type, argDest, delta, frame);
 GcScanValueType(type, in argDest, delta, frame, topLevel);
 break;

 default:
 throw new NotImplementedException();
 }
 }

 private void GcScanValueType(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 private void GcScanValueType(TypeDesc type, in ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame, bool topLevel)
 {
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 if (topLevel)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }
 if (_transitionBlock.IsArgPassedByRef(new TypeHandle(type)))
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 // ReportPointersFromValueTypeArg
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 // ReportPointersFromValueType
 if (type.IsByRefLike)
 {
 FindByRefPointerOffsetsInByRefLikeObject(type, argDest, delta, frame);
 if (argDest.IsStructPassedInRegs())
 {
 argDest.ReportPointersFromStructInRegisters(type, delta, frame);
 return;
 }
 }

 Debug.Assert(type is DefType);
 DefType defType = (DefType)type;
 foreach (FieldDesc field in defType.GetFields())
 {
 if (!field.IsStatic)
 {
 GcScanRoots(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 }
 }
 if (field.IsStatic)
 continue;

 private void FindByRefPointerOffsetsInByRefLikeObject(TypeDesc type, ArgDestination argDest, int delta, CORCOMPILE_GCREFMAP_TOKENS[] frame)
 {
 if (type.IsByRef)
 {
 argDest.GcMark(frame, delta, interior: true);
 return;
 }

 foreach (FieldDesc field in type.GetFields())
 {
 if (!field.IsStatic && field.FieldType.IsByRefLike)
 {
 Debug.Assert(field.FieldType.IsValueType);
 FindByRefPointerOffsetsInByRefLikeObject(field.FieldType, argDest, delta + field.Offset.AsInt, frame);
 }
 GcScanRoots(field.FieldType, in argDest, delta + field.Offset.AsInt, frame, topLevel: false);
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/coreclr/vm/argdestination.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -278,8 +278,6 @@ class ArgDestination
 {
 LIMITED_METHOD_CONTRACT;

 // SPAN-TODO: GC reporting - https://github.com/dotnet/runtime/issues/7103

 _ASSERTE(IsStructPassedInRegs());

 TADDR genRegDest = dac_cast<TADDR>(GetStructGenRegDestinationAddress());
Expand Down

16 changes: 8 additions & 8 deletions
src/coreclr/vm/methodtable.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2500,7 +2500,7 @@ bool MethodTable::ClassifyEightBytesWithNativeLayout(SystemVStructRegisterPassin

 if ((strcmp(className, "Vector`1") == 0) && (strcmp(namespaceName, "System.Numerics") == 0))
 {
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithManagedLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 LOG((LF_JIT, LL_EVERYTHING, "%*s**** ClassifyEightBytesWithNativeLayout: struct %s is a SIMD intrinsic type; will not be enregistered\n",
 nestingLevel * 5, "", this->GetDebugClassName()));

 return false;
Expand DownExpand Up@@ -5500,33 +5500,33 @@ namespace
 for (; it.IsValid() && candidateMaybe == NULL; it.Next())
 {
 MethodDesc *pDeclMD = it.GetMethodDesc();

 // Is this the right slot?
 if (pDeclMD->GetSlot() != targetSlot)
 continue;

 // Is this the right interface?
 if (!pDeclMD->HasSameMethodDefAs(interfaceMD))
 continue;

 if (interfaceMD->HasClassInstantiation())
 {
 // pInterfaceMD will be in the canonical form, so we need to check the specific
 // instantiation against pInterfaceMT.
 //
 // The parent of pDeclMD is unreliable for this purpose because it may or
 // may not be canonicalized. Let's go from the metadata.

 SigTypeContext typeContext = SigTypeContext(pMT);

 mdTypeRef tkParent;
 IfFailThrow(pMD->GetModule()->GetMDImport()->GetParentToken(it.GetToken(), &tkParent));

 MethodTable *pDeclMT = ClassLoader::LoadTypeDefOrRefOrSpecThrowing(
 pMD->GetModule(),
 tkParent,
 &typeContext).AsMethodTable();

 // We do CanCastToInterface to also cover variance.
 // We already know this is a method on the same type definition as the (generic)
 // interface but we need to make sure the instantiations match.
Expand Down

8 changes: 8 additions & 0 deletions
src/coreclr/vm/methodtablebuilder.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8343,11 +8343,19 @@ void MethodTableBuilder::SystemVAmd64CheckForPassStructInRegister()
 SystemVStructRegisterPassingHelper helper((unsigned int)totalStructSize);
 if (GetHalfBakedMethodTable()->ClassifyEightBytes(&helper, 0, 0, useNativeLayout))
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is enregisterable\n",
 this->GetDebugClassName()));

 // All the above tests passed. It's registers passed struct!
 GetHalfBakedMethodTable()->SetRegPassedStruct();

 StoreEightByteClassification(&helper);
 }
 else
 {
 LOG((LF_JIT, LL_EVERYTHING, "**** SystemVAmd64CheckForPassStructInRegister: struct %s is _not_ enregisterable\n",
 this->GetDebugClassName()));
 }
}

// Store the eightbyte classification into the EEClass
Expand Down

16 changes: 7 additions & 9 deletions
src/coreclr/vm/siginfo.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,7 @@ DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_ARRAY, TARGET_POINTER_SIZE, TYPE_GC

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_GENERICINST, -1, TYPE_GC_OTHER, 0)

DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_BYREF, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_TYPEDBYREF, TARGET_POINTER_SIZE*2,TYPE_GC_OTHER, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_VALUEARRAY_UNSUPPORTED, -1, TYPE_GC_NONE, 0)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_I, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_U, TARGET_POINTER_SIZE, TYPE_GC_NONE, 1)
Expand All@@ -135,13 +135,6 @@ unsigned GetSizeForCorElementType(CorElementType etyp)
 return gElementTypeInfo[etyp].m_cbSize;
}

const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp)
{
 LIMITED_METHOD_CONTRACT;
 _ASSERTE(gElementTypeInfo[etyp].m_elementType == etyp);
 return &gElementTypeInfo[etyp];
}

#ifndef DACCESS_COMPILE

void SigPointer::ConvertToInternalExactlyOne(Module* pSigModule, SigTypeContext *pTypeContext, SigBuilder * pSigBuilder, BOOL bSkipCustomModifier)
Expand DownExpand Up@@ -2374,6 +2367,11 @@ CorElementType SigPointer::PeekElemTypeNormalized(Module* pModule, const SigType
 *pthValueType = th;
 }
 }
 else if (type == ELEMENT_TYPE_TYPEDBYREF)
 {
 if (pthValueType != NULL)
 *pthValueType = TypeHandle(g_TypedReferenceMT);
 }

 return(type);
}
Expand DownExpand Up@@ -5120,7 +5118,7 @@ VOID MetaSig::GcScanRoots(ArgDestination *pValue,
 // for value classes describes the state of the instance in its boxed
 // state. Here we are dealing with an unboxed instance, so we must adjust
 // the object size and series offsets appropriately.
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE);
 _ASSERTE(etype == ELEMENT_TYPE_VALUETYPE || etype == ELEMENT_TYPE_TYPEDBYREF);
 {
 PTR_MethodTable pMT = thValueType.AsMethodTable();

Expand Down

1 change: 0 additions & 1 deletion
src/coreclr/vm/siginfo.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,6 @@ struct ElementTypeInfo {
extern const ElementTypeInfo gElementTypeInfo[];

unsigned GetSizeForCorElementType(CorElementType etyp);
const ElementTypeInfo* GetElementTypeInfo(CorElementType etyp);

class SigBuilder;
class ArgDestination;
Expand Down