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

@ -1 +1 @@
dadb2a241526b430ec3e39bb12080a8df07553c3 fd1935995451b6560c501b634243b7eee9978e57

View File

@ -1 +1 @@
4beea0e9effaf218ceee1e135009b3ca6a6849f0 300e23db952f85ab3629e5ed0f438823d4a971fe

File diff suppressed because it is too large Load Diff

View File

@ -10,11 +10,11 @@ generated by GNU Autoconf 2.69. Invocation command line was
## Platform. ## ## Platform. ##
## --------- ## ## --------- ##
hostname = az-ubuntu-general0c8530 hostname = az-ubuntu-general9ac500
uname -m = x86_64 uname -m = x86_64
uname -r = 4.15.0-1095-azure uname -r = 4.15.0-1096-azure
uname -s = Linux uname -s = Linux
uname -v = #105~16.04.1-Ubuntu SMP Sun Sep 6 00:30:35 UTC 2020 uname -v = #106~16.04.1-Ubuntu SMP Thu Sep 10 18:51:54 UTC 2020
/usr/bin/uname -p = unknown /usr/bin/uname -p = unknown
/bin/uname -X = unknown /bin/uname -X = unknown
@ -747,7 +747,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_COMMANDS = CONFIG_COMMANDS =
$ ./config.status $ ./config.status
on az-ubuntu-general0c8530 on az-ubuntu-general9ac500
config.status:1238: creating Makefile config.status:1238: creating Makefile
config.status:1238: creating bdw-gc.pc config.status:1238: creating bdw-gc.pc

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
bcc13441ae32be1e3c21219270f525315c8acd43 fa804413d2d740d2c90a7f59cd0e5001a766c1e9

View File

@ -450,20 +450,28 @@ namespace IKVM.Reflection.Metadata
{ {
return new Enumerator(records, table.RowCount - 1, -1, token); return new Enumerator(records, table.RowCount - 1, -1, token);
} }
int index = BinarySearch(records, table.RowCount, token & 0xFFFFFF); var maskedToken = token & 0xFFFFFF;
int index = BinarySearch(records, table.RowCount, maskedToken);
if (index < 0) if (index < 0)
{ {
return new Enumerator(null, 0, 1, -1); return new Enumerator(null, 0, 1, -1);
} }
int start = index; int start = index;
while (start > 0 && (records[start - 1].FilterKey & 0xFFFFFF) == (token & 0xFFFFFF)) while (start > 0)
{ {
var maskedFilterKey = records [start - 1].FilterKey & 0xFFFFFF;
if (maskedFilterKey != maskedToken && maskedFilterKey != 0)
break;
start--; start--;
} }
int end = index; int end = index;
int max = table.RowCount - 1; int max = table.RowCount - 1;
while (end < max && (records[end + 1].FilterKey & 0xFFFFFF) == (token & 0xFFFFFF)) while (end < max)
{ {
var maskedFilterKey = records [end + 1].FilterKey & 0xFFFFFF;
if (maskedFilterKey != maskedToken && maskedFilterKey != 0)
break;
end++; end++;
} }
return new Enumerator(records, end, start - 1, token); return new Enumerator(records, end, start - 1, token);
@ -481,6 +489,13 @@ namespace IKVM.Reflection.Metadata
{ {
return mid; return mid;
} }
else if (maskedValue == 0)
{
if (min > 0)
min--;
if (max < length - 1)
max++;
}
else if (maskedToken < maskedValue) else if (maskedToken < maskedValue)
{ {
max = mid - 1; max = mid - 1;

View File

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

View File

@ -1042,6 +1042,7 @@ namespace IKVM.Reflection
public ConstructorInfo GetConstructor(BindingFlags bindingAttr, Binder binder, Type[] types, ParameterModifier[] modifiers) public ConstructorInfo GetConstructor(BindingFlags bindingAttr, Binder binder, Type[] types, ParameterModifier[] modifiers)
{ {
ConstructorInfo ci1 = null; ConstructorInfo ci1 = null;
bindingAttr |= BindingFlags.DeclaredOnly;
if ((bindingAttr & BindingFlags.Instance) != 0) if ((bindingAttr & BindingFlags.Instance) != 0)
{ {
ci1 = GetConstructorImpl(ConstructorInfo.ConstructorName, bindingAttr, binder, types, modifiers); ci1 = GetConstructorImpl(ConstructorInfo.ConstructorName, bindingAttr, binder, types, modifiers);

View File

@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable. // Use these assembly version constants to make code more maintainable.
// //
public const string MonoVersion = "6.12.0.100"; public const string MonoVersion = "6.12.0.101";
public const string MonoCompany = "Mono development team"; public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors"; public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1 +1 @@
1ed38c1e45593fcc6d999ad365a6105632e5a1f7 3f80a942606c0cbf8b39d8d26edef2a7401db948

View File

@ -1 +1 @@
d0e9fd93287aa2fe62ae19e6981f2b3118592ace 7d288343a4b69d466d02a2f8a00c3308969190b7

View File

@ -1 +1 @@
58b7bdb2285d1e9e8d6086b509a1ecd55f2a99b7 ce5e42fabb108841a9e875d56557d4b723439af2

View File

@ -1 +1 @@
da00279d97815b30bc43d175751e4b00a1b6b9b5 1ed53529ca622bef68256f4f62ab76f522cc1995

View File

@ -1 +1 @@
1ac98f70ed7d431f23b79f3afb0082d5de60793e c609f925fc19565f6abb4e8c25ae203f49aaba9e

View File

@ -1 +1 @@
5e0e2a981b221d43e9188100ed0729c0f326a06d 1f4d7832b20f9a1bd242d76a01f447dc0f231935

View File

@ -1 +1 @@
083688225fcce744df9b551a68a67247f40e2177 f83e72da976e0df970d17518a05c9e325d67dc1e

View File

@ -1 +1 @@
c4842486107b3653c0a3f079db9e3cbf931c1bad fa62d17411a409cff47710f05176976516a61cf4

View File

@ -1 +1 @@
1ed38c1e45593fcc6d999ad365a6105632e5a1f7 3f80a942606c0cbf8b39d8d26edef2a7401db948

View File

@ -1 +1 @@
d0e9fd93287aa2fe62ae19e6981f2b3118592ace 7d288343a4b69d466d02a2f8a00c3308969190b7

Some files were not shown because too many files have changed in this diff Show More