Skip to content

Commit

Permalink
Revert "Add workaround for dotnet/runtime#90800"
Browse files Browse the repository at this point in the history
This reverts commit 959cef6.
  • Loading branch information
filipnavara committed Aug 25, 2023
1 parent efeb0b7 commit cdd9be2
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 24 deletions.
6 changes: 0 additions & 6 deletions src/ObjCRuntime/RegistrarHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,6 @@ static IntPtr LookupUnmanagedFunctionInAssembly (IntPtr assembly_name, string? s
return entry.Registrar.LookupUnmanagedFunction (symbol, id);
}

[MethodImpl(MethodImplOptions.NoInlining)]
internal static bool RuntimeTypeHandleEquals (ref RuntimeTypeHandle typeHandle, RuntimeTypeHandle otherTypeHandle)
{
return typeHandle.Equals (otherTypeHandle);
}

internal static Type LookupRegisteredType (Assembly assembly, uint id)
{
var entry = GetMapEntry (assembly);
Expand Down
18 changes: 0 additions & 18 deletions tools/dotnet-linker/AppBundleRewriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -500,13 +500,9 @@ public MethodReference DynamicDependencyAttribute_ctor__DynamicallyAccessedMembe

public MethodReference RuntimeTypeHandle_Equals {
get {
if (configuration.Application.XamarinRuntime == XamarinRuntime.MonoVM) {
return RegistrarHelper_RuntimeTypeHandleEquals;
}
return GetMethodReference (CorlibAssembly, System_RuntimeTypeHandle, "Equals", isStatic: false, System_RuntimeTypeHandle);
}
}

public MethodReference MethodBase_Invoke {
get {
return GetMethodReference (CorlibAssembly, System_Reflection_MethodBase, "Invoke", (v) =>
Expand Down Expand Up @@ -757,20 +753,6 @@ public MethodReference RegistrarHelper_Register {
}
}

public MethodReference RegistrarHelper_RuntimeTypeHandleEquals {
get {
return GetMethodReference (PlatformAssembly,
ObjCRuntime_RegistrarHelper,
"RuntimeTypeHandleEquals",
(v) => v.IsStatic
&& v.HasParameters
&& v.Parameters.Count == 2
&& v.Parameters [0].ParameterType is ByReferenceType brt1 && brt1.ElementType.Is ("System", "RuntimeTypeHandle")
&& v.Parameters [1].ParameterType.Is ("System", "RuntimeTypeHandle")
&& !v.HasGenericParameters);
}
}

public MethodReference IManagedRegistrar_LookupUnmanagedFunction {
get {
return GetMethodReference (PlatformAssembly,
Expand Down

0 comments on commit cdd9be2

Please sign in to comment.