Imported Upstream version 6.12.0.101

Former-commit-id: 86e5d3c0859336c41f589d3bcf96fcc6ecd603cd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2020-10-03 08:40:42 +00:00
parent 77df3da300
commit d7ffa4a239
54 changed files with 765 additions and 745 deletions

View File

@@ -146,7 +146,7 @@ namespace IKVM.Reflection
System.Runtime.InteropServices.CallingConvention unmanagedCallingConvention = 0;
bool unmanaged;
byte flags = br.ReadByte();
switch (flags & 7)
switch (flags & 0xf)
{
case DEFAULT:
callingConvention = CallingConventions.Standard;
@@ -168,6 +168,10 @@ namespace IKVM.Reflection
unmanagedCallingConvention = System.Runtime.InteropServices.CallingConvention.FastCall;
unmanaged = true;
break;
case 0x09: // UNMANAGED
unmanagedCallingConvention = (System.Runtime.InteropServices.CallingConvention)0x9;
unmanaged = true;
break;
case VARARG:
callingConvention = CallingConventions.VarArgs;
unmanaged = false;