@@ -1733,7 +1733,7 @@ var_types Compiler::impNormStructType(CORINFO_CLASS_HANDLE structHnd, CorInfoTyp
17331733 const DWORD structFlags = info.compCompHnd->getClassAttribs(structHnd);
17341734
17351735 // Don't bother if the struct contains GC references of byrefs, it can't be a SIMD type.
1736- if ((structFlags & (CORINFO_FLG_CONTAINS_GC_PTR | CORINFO_FLG_CONTAINS_STACK_PTR )) == 0)
1736+ if ((structFlags & (CORINFO_FLG_CONTAINS_GC_PTR | CORINFO_FLG_BYREF_LIKE )) == 0)
17371737 {
17381738 unsigned originalSize = info.compCompHnd->getClassSize(structHnd);
17391739
@@ -5876,7 +5876,7 @@ bool Compiler::verIsByRefLike(const typeInfo& ti)
58765876 {
58775877 return false;
58785878 }
5879- return info.compCompHnd->getClassAttribs(ti.GetClassHandleForValueClass()) & CORINFO_FLG_CONTAINS_STACK_PTR ;
5879+ return info.compCompHnd->getClassAttribs(ti.GetClassHandleForValueClass()) & CORINFO_FLG_BYREF_LIKE ;
58805880}
58815881
58825882bool Compiler::verIsSafeToReturnByRef(const typeInfo& ti)
@@ -5897,7 +5897,7 @@ bool Compiler::verIsBoxable(const typeInfo& ti)
58975897 || ti.IsUnboxedGenericTypeVar() ||
58985898 (ti.IsType(TI_STRUCT) &&
58995899 // exclude byreflike structs
5900- !(info.compCompHnd->getClassAttribs(ti.GetClassHandleForValueClass()) & CORINFO_FLG_CONTAINS_STACK_PTR )));
5900+ !(info.compCompHnd->getClassAttribs(ti.GetClassHandleForValueClass()) & CORINFO_FLG_BYREF_LIKE )));
59015901}
59025902
59035903// Is it a boxed value type?
@@ -14698,7 +14698,7 @@ void Compiler::impImportBlockCode(BasicBlock* block)
1469814698 info.compCompHnd->getChildType(resolvedToken.hClass, &elemTypeHnd);
1469914699 assert(!(elemTypeHnd == nullptr && corType == CORINFO_TYPE_VALUECLASS));
1470014700 Verify(elemTypeHnd == nullptr ||
14701- !(info.compCompHnd->getClassAttribs(elemTypeHnd) & CORINFO_FLG_CONTAINS_STACK_PTR ),
14701+ !(info.compCompHnd->getClassAttribs(elemTypeHnd) & CORINFO_FLG_BYREF_LIKE ),
1470214702 "newarr of byref-like objects");
1470314703 verVerifyCall(opcode, &resolvedToken, nullptr, ((prefixFlags & PREFIX_TAILCALL_EXPLICIT) != 0),
1470414704 ((prefixFlags & PREFIX_READONLY) != 0), delegateCreateStart, codeAddr - 1,
@@ -15816,7 +15816,7 @@ void Compiler::impImportBlockCode(BasicBlock* block)
1581615816 CORINFO_CLASS_HANDLE elemTypeHnd;
1581715817 info.compCompHnd->getChildType(resolvedToken.hClass, &elemTypeHnd);
1581815818 Verify(elemTypeHnd == nullptr ||
15819- !(info.compCompHnd->getClassAttribs(elemTypeHnd) & CORINFO_FLG_CONTAINS_STACK_PTR ),
15819+ !(info.compCompHnd->getClassAttribs(elemTypeHnd) & CORINFO_FLG_BYREF_LIKE ),
1582015820 "array of byref-like type");
1582115821 }
1582215822
0 commit comments