Skip to content

Commit af28380

Browse files
committed
Improve the previous fix to use the common pattern
1 parent 714cff6 commit af28380

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/CLR/Core/TypeSystem.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ bool CLR_RT_TypeDef_Instance::ResolveToken(
978978
// Skip any leading SZARRAY or BYREF
979979
do
980980
{
981-
if (parser.Advance(elem) != S_OK)
981+
if (FAILED(parser.Advance(elem)))
982982
{
983983
return false;
984984
}
@@ -988,17 +988,17 @@ bool CLR_RT_TypeDef_Instance::ResolveToken(
988988
if (elem.DataType == DATATYPE_GENERICINST)
989989
{
990990
// consume the CLASS/VALUETYPE marker
991-
if (parser.Advance(elem) != S_OK)
991+
if (FAILED(parser.Advance(elem)))
992992
{
993993
return false;
994994
}
995995
// consume the generic‐definition token itself
996-
if (parser.Advance(elem) != S_OK)
996+
if (FAILED(parser.Advance(elem)))
997997
{
998998
return false;
999999
}
10001000
// consume the count of generic arguments
1001-
if (parser.Advance(elem) != S_OK)
1001+
if (FAILED(parser.Advance(elem)))
10021002
{
10031003
return false;
10041004
}
@@ -1007,7 +1007,7 @@ bool CLR_RT_TypeDef_Instance::ResolveToken(
10071007
// walk forward until a VAR (type‐generic) or MVAR (method‐generic) is hit
10081008
while (elem.DataType != DATATYPE_VAR && elem.DataType != DATATYPE_MVAR)
10091009
{
1010-
if (parser.Advance(elem) != S_OK)
1010+
if (FAILED(parser.Advance(elem)))
10111011
{
10121012
return false;
10131013
}

0 commit comments

Comments
 (0)