Throw exceptions instead of returning HRESULT.

src/coreclr/vm/jitinterface.cpp

@@ -7750,7 +7750,7 @@ class MethodInfoHelperContext final
     }
 };
 
-static HRESULT getMethodInfoHelper(
+static void getMethodInfoHelper(
     MethodInfoHelperContext& cxt,
     CORINFO_METHOD_INFO* methInfo)
 {
@@ -7829,13 +7829,8 @@ static HRESULT getMethodInfoHelper(
     }
     else
     {
-        HRESULT hr = ftn->GenerateUnsafeAccessor(&cxt.TransientResolver, &cxt.Header);
-        if (FAILED(hr))
-        {
-            if (hr == E_FAIL)
-                hr = COR_E_BADIMAGEFORMAT;
-            return hr;
-        }
+        if (!ftn->TryGenerateUnsafeAccessor(&cxt.TransientResolver, &cxt.Header))
+            ThrowHR(COR_E_BADIMAGEFORMAT);
 
         scopeHnd = cxt.CreateScopeHandle();
 
@@ -7913,8 +7908,6 @@ static HRESULT getMethodInfoHelper(
         &context,
         CONV_TO_JITSIG_FLAGS_LOCALSIG,
         &methInfo->locals);
-
-    return S_OK;
 } // getMethodInfoHelper
 
 //---------------------------------------------------------------------------------------
@@ -7940,13 +7933,15 @@ CEEInfo::getMethodInfo(
     MethodInfoHelperContext cxt{ ftn };
     if (ftn->IsDynamicMethod())
     {
-        result = SUCCEEDED(getMethodInfoHelper(cxt, methInfo));
+        getMethodInfoHelper(cxt, methInfo);
+        result = true;
     }
     else if (!ftn->IsWrapperStub() && ftn->HasILHeader())
     {
         COR_ILMETHOD_DECODER header(ftn->GetILHeader(TRUE), ftn->GetMDImport(), NULL);
         cxt.Header = &header;
-        result = SUCCEEDED(getMethodInfoHelper(cxt, methInfo));
+        getMethodInfoHelper(cxt, methInfo);
+        result = true;
     }
     else if (ftn->IsIL() && ftn->GetRVA() == 0)
     {
@@ -7959,7 +7954,8 @@ CEEInfo::getMethodInfo(
             cxt.TransientResolver = GetDynamicResolver(detailsMaybe->Scope);
         }
 
-        result = SUCCEEDED(getMethodInfoHelper(cxt, methInfo));
+        getMethodInfoHelper(cxt, methInfo);
+        result = true;
     }
 
     if (result)
@@ -13064,11 +13060,9 @@ PCODE UnsafeJitFunction(PrepareCodeConfig* config,
     }
 #endif // _DEBUG
 
-    HRESULT hr;
     MethodInfoHelperContext cxt{ ftn, ILHeader };
     CORINFO_METHOD_INFO methodInfo;
-    if (FAILED(hr = getMethodInfoHelper(cxt, &methodInfo)))
-        ThrowHR(hr);
+    getMethodInfoHelper(cxt, &methodInfo);
 
     // If it's generic then we can only enter through an instantiated MethodDesc
     _ASSERTE(!ftn->IsGenericMethodDefinition());

src/coreclr/vm/method.hpp

@@ -1818,7 +1818,7 @@ class MethodDesc
     PCODE JitCompileCodeLocked(PrepareCodeConfig* pConfig, JitListLockEntry* pLockEntry, ULONG* pSizeOfCode, CORJIT_FLAGS* pFlags);
 
 public:
-    HRESULT GenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder);
+    bool TryGenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder);
 #endif // DACCESS_COMPILE
 
 #ifdef HAVE_GCCOVER

src/coreclr/vm/prestub.cpp

@@ -1363,7 +1363,7 @@ namespace
     }
 }
 
-HRESULT MethodDesc::GenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder)
+bool MethodDesc::TryGenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMETHOD_DECODER** methodILDecoder)
 {
     STANDARD_VM_CONTRACT;
     _ASSERTE(resolver != NULL);
@@ -1378,14 +1378,14 @@ HRESULT MethodDesc::GenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMET
     ULONG dataLen;
     HRESULT hr = GetCustomAttribute(WellKnownAttribute::UnsafeAccessorAttribute, &data, &dataLen);
     if (hr != S_OK)
-        return E_FAIL;
+        return false;
 
     UnsafeAccessorKind kind;
     SString name;
 
     CustomAttributeParser ca(data, dataLen);
     if (!TryParseUnsafeAccessorAttribute(this, ca, kind, name))
-        return COR_E_BADIMAGEFORMAT;
+        ThrowHR(COR_E_BADIMAGEFORMAT);
 
     GenerationContext context{ kind, this };
 
@@ -1415,29 +1415,29 @@ HRESULT MethodDesc::GenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMET
         // The name is defined by the runtime and should be empty.
         if (retType.IsNull() || !name.IsEmpty())
         {
-            return COR_E_BADIMAGEFORMAT;
+            ThrowHR(COR_E_BADIMAGEFORMAT);
         }
 
         context.TargetType = retType;
         if (!TrySetTargetMethodCtor(context)
             || !TryGenerateAccessor(context, resolver, methodILDecoder))
         {
-            return COR_E_MISSINGMETHOD;
+            ThrowHR(COR_E_MISSINGMETHOD);
         }
         break;
 
     case UnsafeAccessorKind::Method:
     case UnsafeAccessorKind::StaticMethod:
         // Method access requires a target type.
         if (firstArgType.IsNull())
-            return COR_E_BADIMAGEFORMAT;
+            ThrowHR(COR_E_BADIMAGEFORMAT);
 
         context.TargetType = firstArgType;
         context.IsTargetStatic = kind == UnsafeAccessorKind::StaticMethod;
         if (!TrySetTargetMethod(context, name.GetUTF8())
             || !TryGenerateAccessor(context, resolver, methodILDecoder))
         {
-            return COR_E_MISSINGMETHOD;
+            ThrowHR(COR_E_MISSINGMETHOD);
         }
         break;
 
@@ -1446,7 +1446,7 @@ HRESULT MethodDesc::GenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMET
         // Field access requires a single argument for target type and a return type.
         if (argCount != 1 || firstArgType.IsNull() || retType.IsNull())
         {
-            return COR_E_BADIMAGEFORMAT;
+            ThrowHR(COR_E_BADIMAGEFORMAT);
         }
 
         // The return type must be byref.
@@ -1457,24 +1457,24 @@ HRESULT MethodDesc::GenerateUnsafeAccessor(DynamicResolver** resolver, COR_ILMET
                 && firstArgType.IsValueType()
                 && !firstArgType.IsByRef()))
         {
-            return COR_E_BADIMAGEFORMAT;
+            ThrowHR(COR_E_BADIMAGEFORMAT);
         }
 
         context.TargetType = firstArgType;
         context.IsTargetStatic = kind == UnsafeAccessorKind::StaticField;
         if (!TrySetTargetField(context, name.GetUTF8(), retType.GetTypeParam())
             || !TryGenerateAccessor(context, resolver, methodILDecoder))
         {
-            return COR_E_MISSINGFIELD;
+            ThrowHR(COR_E_MISSINGFIELD);
         }
         break;
 
     default:
         _ASSERTE(!"Unknown UnsafeAccessorKind");
-        return E_UNEXPECTED;
+        ThrowHR(E_UNEXPECTED);
     }
 
-    return S_OK;
+    return true;
 }
 
 PrepareCodeConfig::PrepareCodeConfig() {}