Imported Upstream version 6.4.0.137

Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions

View File

@ -61,7 +61,7 @@ namespace System
get {
if (value == IntPtr.Zero)
throw new ArgumentNullException (String.Empty, "Invalid handle");
return Module.GetMDStreamVersion (value);
return RuntimeModule.GetMDStreamVersion (value);
}
}
@ -69,7 +69,7 @@ namespace System
{
if (value == IntPtr.Zero)
throw new ArgumentNullException (String.Empty, "Invalid handle");
Module.GetPEKind (value, out peKind, out machine);
RuntimeModule.GetPEKind (value, out peKind, out machine);
}
public RuntimeFieldHandle ResolveFieldHandle (int fieldToken)
@ -104,7 +104,7 @@ namespace System
ResolveTokenError error;
if (value == IntPtr.Zero)
throw new ArgumentNullException (String.Empty, "Invalid handle");
IntPtr res = Module.ResolveTypeToken (value, typeToken, ptrs_from_handles (typeInstantiationContext), ptrs_from_handles (methodInstantiationContext), out error);
IntPtr res = RuntimeModule.ResolveTypeToken (value, typeToken, ptrs_from_handles (typeInstantiationContext), ptrs_from_handles (methodInstantiationContext), out error);
if (res == IntPtr.Zero)
throw new TypeLoadException (String.Format ("Could not load type '0x{0:x}' from assembly '0x{1:x}'", typeToken, value.ToInt64 ()));
else
@ -117,7 +117,7 @@ namespace System
ResolveTokenError error;
if (value == IntPtr.Zero)
throw new ArgumentNullException (String.Empty, "Invalid handle");
IntPtr res = Module.ResolveMethodToken (value, methodToken, ptrs_from_handles (typeInstantiationContext), ptrs_from_handles (methodInstantiationContext), out error);
IntPtr res = RuntimeModule.ResolveMethodToken (value, methodToken, ptrs_from_handles (typeInstantiationContext), ptrs_from_handles (methodInstantiationContext), out error);
if (res == IntPtr.Zero)
throw new Exception (String.Format ("Could not load method '0x{0:x}' from assembly '0x{1:x}'", methodToken, value.ToInt64 ()));
else
@ -130,7 +130,7 @@ namespace System
ResolveTokenError error;
if (value == IntPtr.Zero)
throw new ArgumentNullException (String.Empty, "Invalid handle");
IntPtr res = Module.ResolveFieldToken (value, fieldToken, ptrs_from_handles (typeInstantiationContext), ptrs_from_handles (methodInstantiationContext), out error);
IntPtr res = RuntimeModule.ResolveFieldToken (value, fieldToken, ptrs_from_handles (typeInstantiationContext), ptrs_from_handles (methodInstantiationContext), out error);
if (res == IntPtr.Zero)
throw new Exception (String.Format ("Could not load field '0x{0:x}' from assembly '0x{1:x}'", fieldToken, value.ToInt64 ()));
else