Merge branch 'upstream'

Former-commit-id: 9b5ac3e67549d04743acb09d820e5b10c713f46e
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-03-01 09:33:01 +00:00
commit d257270909
37 changed files with 44 additions and 43 deletions

View File

@ -1 +1 @@
e4b811826621e311f69263092df0e00b179fa373
e04390d13efbb906a4c7205066284c78ad908d3d

View File

@ -1 +1 @@
f3be6684494b4fb113573ae47af14b3825890374
b78b8e302331d583167ac8c2b4299783363a0a2c

View File

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

View File

@ -1 +1 @@
17d71941f008b9d762ca324d866fafb74c4710da
48c2d3af0e2d1d2c00ac99e9070e3aa547943b32

View File

@ -1 +1 @@
6476109f8ed6ff211b4ea34f27d1c116d3c75109
8564042fbb77157d176988b757c441f6741e5ef4

View File

@ -1 +1 @@
0d866f89477a413e0602168cedb677538c26c5a5
eb01300809eefbb499b043319f321d0e122016b2

View File

@ -1 +1 @@
8c4410a6c0c7fd0987c68314e9da660f1a09eb02
8021eda09d2df537bd33b2ecbbc9f925afd8d028

View File

@ -1 +1 @@
724ba0ca29a8f94f33c0c2b9cfa478b5513c8ad8
e869b0dacf55e322347e9d2d349db6d6a958ae99

View File

@ -1 +1 @@
84b06b604c65bfe45810b53017f3ae0faf52520a
7a1a1baab43342fffb44bef0f8c6abae2257137c

View File

@ -1 +1 @@
c9899b42c53f78da69acda8a88a613cca6eb8b5b
1d17cca82bd569fd30c52a475c3eaa6670f33dc6

View File

@ -1 +1 @@
17d71941f008b9d762ca324d866fafb74c4710da
48c2d3af0e2d1d2c00ac99e9070e3aa547943b32

View File

@ -1 +1 @@
6476109f8ed6ff211b4ea34f27d1c116d3c75109
8564042fbb77157d176988b757c441f6741e5ef4

View File

@ -1 +1 @@
0d866f89477a413e0602168cedb677538c26c5a5
eb01300809eefbb499b043319f321d0e122016b2

View File

@ -1 +1 @@
8c4410a6c0c7fd0987c68314e9da660f1a09eb02
8021eda09d2df537bd33b2ecbbc9f925afd8d028

View File

@ -1 +1 @@
724ba0ca29a8f94f33c0c2b9cfa478b5513c8ad8
e869b0dacf55e322347e9d2d349db6d6a958ae99

View File

@ -1 +1 @@
84b06b604c65bfe45810b53017f3ae0faf52520a
7a1a1baab43342fffb44bef0f8c6abae2257137c

View File

@ -1 +1 @@
c9899b42c53f78da69acda8a88a613cca6eb8b5b
1d17cca82bd569fd30c52a475c3eaa6670f33dc6

View File

@ -1 +1 @@
17d71941f008b9d762ca324d866fafb74c4710da
48c2d3af0e2d1d2c00ac99e9070e3aa547943b32

View File

@ -1 +1 @@
6476109f8ed6ff211b4ea34f27d1c116d3c75109
8564042fbb77157d176988b757c441f6741e5ef4

View File

@ -1 +1 @@
0d866f89477a413e0602168cedb677538c26c5a5
eb01300809eefbb499b043319f321d0e122016b2

View File

@ -1 +1 @@
8c4410a6c0c7fd0987c68314e9da660f1a09eb02
8021eda09d2df537bd33b2ecbbc9f925afd8d028

View File

@ -1 +1 @@
724ba0ca29a8f94f33c0c2b9cfa478b5513c8ad8
e869b0dacf55e322347e9d2d349db6d6a958ae99

View File

@ -1 +1 @@
84b06b604c65bfe45810b53017f3ae0faf52520a
7a1a1baab43342fffb44bef0f8c6abae2257137c

View File

@ -1 +1 @@
c9899b42c53f78da69acda8a88a613cca6eb8b5b
1d17cca82bd569fd30c52a475c3eaa6670f33dc6

View File

@ -216,6 +216,7 @@ class Tests
return 0;
}
[Category ("!INTERPRETER")]
static int test_42_arm64_dyncall_vtypebyval () {
var method = typeof (Foo5<string>).GetMethod ("vtype_by_val").MakeGenericMethod (new Type [] { typeof (int), typeof (long?), typeof (long?), typeof (long?), typeof (long?) });
long res = (long)method.Invoke (null, new object [] { 1, 2L, 3L, 4L, 42L });

View File

@ -88,8 +88,8 @@ cond_exc_nc: len:8
cond_exc_ne_un: len:8
cond_exc_no: len:8
cond_exc_ov: len:8
div_imm: dest:i src1:i src2:i len:24
div_un_imm: dest:i src1:i src2:i len:24
div_imm: dest:i src1:i len:24
div_un_imm: dest:i src1:i len:24
endfinally: len:8
fcall: dest:g len:26 clob:c
fcall_membase: dest:g src1:b len:14 clob:c
@ -163,7 +163,7 @@ loadu2_membase: dest:i src1:b len:30
loadu4_mem: dest:i len:8
loadu4_membase: dest:i src1:b len:30
localloc: dest:i src1:i len:106
memory_barrier: len: 10
memory_barrier: len:10
move: dest:i src1:i len:4
mul_imm: dest:i src1:i len:24
nop: len:4
@ -176,9 +176,9 @@ rethrow: src1:i len:26
or_imm: dest:i src1:i len:24
r4const: dest:f len:26
r8const: dest:f len:24
rem_imm: dest:i src1:i src2:i len:24
rem_un_imm: dest:i src1:i src2:i len:24
s390_bkchain: len: 8 dest:i src1:i
rem_imm: dest:i src1:i len:24
rem_un_imm: dest:i src1:i len:24
s390_bkchain: len:8 dest:i src1:i
s390_move: len:48 dest:b src1:b
s390_setf4ret: dest:f src1:f len:4
sbb: dest:i src1:i src2:i len:6
@ -303,7 +303,7 @@ long_xor: dest:i src1:i src2:i len:8
long_neg: dest:i src1:i len:6
long_not: dest:i src1:i len:12
long_rem: dest:i src1:i src2:i len:12
long_rem_imm: dest:i src1:i src2:i len:12
long_rem_imm: dest:i src1:i len:12
long_rem_un: dest:i src1:i src2:i len:16
long_shl: dest:i src1:i src2:i len:14
long_shl_imm: dest:i src1:i len:14
@ -320,7 +320,7 @@ long_conv_to_i2: dest:i src1:i len:12
long_conv_to_i4: dest:i src1:i len:4
long_conv_to_i8: dest:i src1:i len:4
long_conv_to_i: dest:i src1:i len:4
long_conv_to_ovf_i: dest:i src1:i src2:i len:44
long_conv_to_ovf_i: dest:i src1:i len:44
long_conv_to_ovf_i4_un: dest:i src1:i len:50
long_conv_to_ovf_u4: dest:i src1:i len:48
long_conv_to_ovf_u8_un: dest:i src1:i len:4
@ -412,7 +412,7 @@ s390_crj: src1:i src2:i len:24
s390_crj_un: src1:i src2:i len:24
s390_cgrj: src1:i src2:i len:24
s390_cgrj_un: src1:i src2:i len:24
s390_cij: src1:i len:24
s390_cij: len:24
s390_cij_un: src1:i len:24
s390_cgij: src1:i len:24
s390_cgij_un: src1:i len:24
s390_cgij: len:24
s390_cgij_un: len:24

View File

@ -1207,7 +1207,7 @@ MINI_OP(OP_S390_ARGPTR, "s390_argptr", NONE, NONE, NONE)
MINI_OP(OP_S390_STKARG, "s390_stkarg", NONE, NONE, NONE)
MINI_OP(OP_S390_MOVE, "s390_move", IREG, IREG, NONE)
MINI_OP(OP_S390_SETF4RET, "s390_setf4ret", FREG, FREG, NONE)
MINI_OP(OP_S390_BKCHAIN, "s390_bkchain", NONE, NONE, NONE)
MINI_OP(OP_S390_BKCHAIN, "s390_bkchain", IREG, IREG, NONE)
MINI_OP(OP_S390_LADD, "s390_long_add", LREG, IREG, IREG)
MINI_OP(OP_S390_LADD_OVF, "s390_long_add_ovf", LREG, IREG, IREG)
MINI_OP(OP_S390_LADD_OVF_UN, "s390_long_add_ovf_un", LREG, IREG, IREG)

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/331f927"
#define FULL_VERSION "explicit/e1ff841"

Binary file not shown.

View File

@ -1 +1 @@
6861e8c7e487f592d9cde75d28413716ed786a9e
cc17d5718dfd92c1e21cd13370e2bb090008dd9f

Binary file not shown.

View File

@ -1 +1 @@
70cfa94fee4e4b593aad078253f95b0e2b3bc47a
b1f5822e3a00e6c7597f98e4b5f177018d56638f

Binary file not shown.

View File

@ -1 +1 @@
89b6b84f8535aaf21d282b1715f46e521e3ab5cc
f3748e2b65933a60ac113e282d177399a69ea14e

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.0.144\n"
"Project-Id-Version: mono 5.10.0.147\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-02-28 08:21+0000\n"
"POT-Creation-Date: 2018-03-01 08:38+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
9f762a51921c5e8b807627a6815245c78668d2a3
6db44217511c3cd292c5dd25bd446b84a5b2a184