Merge branch 'upstream'
Former-commit-id: 1fb4f88674ce4a51478603fd34587fafa48b9f5b
This commit is contained in:
commit
abeb6c97a3
@ -1 +1 @@
|
||||
fca97793b0b8583bf5282c9f8e8332b35dd646b8
|
||||
0849d5e3f8ec325e7c1bb4011a96bdc477d00d5b
|
@ -1 +1 @@
|
||||
ec69e5c1a3629e42d046cbfce30f47c304f893bb
|
||||
56927aa0fd397a52e8082e767c6df92de86ac18a
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.20.1.4";
|
||||
public const string MonoVersion = "5.20.1.6";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -1 +1 @@
|
||||
ea535a6f314b3405b15dc638c720e64d6d1f8425
|
||||
540dbea12f8b27a65ae3f2c4dc4d811f63b0ab67
|
@ -1 +1 @@
|
||||
71246785b6b278180893665c51732cbf1b7ca6b8
|
||||
08541426a882e077318f19f41fe7243c5bc7e6e6
|
@ -1 +1 @@
|
||||
68e712aa783afddbcc38074cef6d5ca48ad1a2d0
|
||||
cb8693736bd3ed16eb04e5e1bde621cad2567929
|
Binary file not shown.
@ -1 +1 @@
|
||||
d1fb25985b83e51e462374f9bc1d35ac9360153e
|
||||
c6c84a412fad434f64a45b8a0f8c140e8b15b44b
|
@ -1 +1 @@
|
||||
b692bed1b1ec27ae3cea5c212219f4c3b7c9465f
|
||||
f97912af39d469454cad3f2b534206a9dda327e0
|
@ -1 +1 @@
|
||||
c2c0d47ba9df5f2e8427e1a6a040ba1df11012aa
|
||||
bad311683e5ab23ffaea89cb2d1ed726e3c905dc
|
@ -1 +1 @@
|
||||
8b9fcfdf1a2195f75d2f00fcf68c085a0feb5acd
|
||||
b58e80116f5c4f117838ae12e85a5df837002d03
|
@ -1 +1 @@
|
||||
ea535a6f314b3405b15dc638c720e64d6d1f8425
|
||||
540dbea12f8b27a65ae3f2c4dc4d811f63b0ab67
|
@ -1 +1 @@
|
||||
71246785b6b278180893665c51732cbf1b7ca6b8
|
||||
08541426a882e077318f19f41fe7243c5bc7e6e6
|
@ -1 +1 @@
|
||||
68e712aa783afddbcc38074cef6d5ca48ad1a2d0
|
||||
cb8693736bd3ed16eb04e5e1bde621cad2567929
|
Binary file not shown.
@ -1 +1 @@
|
||||
d1fb25985b83e51e462374f9bc1d35ac9360153e
|
||||
c6c84a412fad434f64a45b8a0f8c140e8b15b44b
|
@ -1 +1 @@
|
||||
b692bed1b1ec27ae3cea5c212219f4c3b7c9465f
|
||||
f97912af39d469454cad3f2b534206a9dda327e0
|
@ -1 +1 @@
|
||||
c2c0d47ba9df5f2e8427e1a6a040ba1df11012aa
|
||||
bad311683e5ab23ffaea89cb2d1ed726e3c905dc
|
@ -1 +1 @@
|
||||
8b9fcfdf1a2195f75d2f00fcf68c085a0feb5acd
|
||||
b58e80116f5c4f117838ae12e85a5df837002d03
|
@ -1 +1 @@
|
||||
ea535a6f314b3405b15dc638c720e64d6d1f8425
|
||||
540dbea12f8b27a65ae3f2c4dc4d811f63b0ab67
|
@ -1 +1 @@
|
||||
71246785b6b278180893665c51732cbf1b7ca6b8
|
||||
08541426a882e077318f19f41fe7243c5bc7e6e6
|
@ -1 +1 @@
|
||||
68e712aa783afddbcc38074cef6d5ca48ad1a2d0
|
||||
cb8693736bd3ed16eb04e5e1bde621cad2567929
|
Binary file not shown.
@ -1 +1 @@
|
||||
d1fb25985b83e51e462374f9bc1d35ac9360153e
|
||||
c6c84a412fad434f64a45b8a0f8c140e8b15b44b
|
@ -1 +1 @@
|
||||
b692bed1b1ec27ae3cea5c212219f4c3b7c9465f
|
||||
f97912af39d469454cad3f2b534206a9dda327e0
|
@ -1 +1 @@
|
||||
c2c0d47ba9df5f2e8427e1a6a040ba1df11012aa
|
||||
bad311683e5ab23ffaea89cb2d1ed726e3c905dc
|
@ -1 +1 @@
|
||||
8b9fcfdf1a2195f75d2f00fcf68c085a0feb5acd
|
||||
b58e80116f5c4f117838ae12e85a5df837002d03
|
@ -1 +1 @@
|
||||
ea535a6f314b3405b15dc638c720e64d6d1f8425
|
||||
540dbea12f8b27a65ae3f2c4dc4d811f63b0ab67
|
@ -1 +1 @@
|
||||
71246785b6b278180893665c51732cbf1b7ca6b8
|
||||
08541426a882e077318f19f41fe7243c5bc7e6e6
|
@ -1 +1 @@
|
||||
68e712aa783afddbcc38074cef6d5ca48ad1a2d0
|
||||
cb8693736bd3ed16eb04e5e1bde621cad2567929
|
Binary file not shown.
@ -1 +1 @@
|
||||
d1fb25985b83e51e462374f9bc1d35ac9360153e
|
||||
c6c84a412fad434f64a45b8a0f8c140e8b15b44b
|
@ -1 +1 @@
|
||||
b692bed1b1ec27ae3cea5c212219f4c3b7c9465f
|
||||
f97912af39d469454cad3f2b534206a9dda327e0
|
@ -1 +1 @@
|
||||
c2c0d47ba9df5f2e8427e1a6a040ba1df11012aa
|
||||
bad311683e5ab23ffaea89cb2d1ed726e3c905dc
|
@ -1 +1 @@
|
||||
8b9fcfdf1a2195f75d2f00fcf68c085a0feb5acd
|
||||
b58e80116f5c4f117838ae12e85a5df837002d03
|
@ -450,15 +450,18 @@ typedef union {
|
||||
} while (0)
|
||||
|
||||
|
||||
#define amd64_lea_membase_body(inst,reg,basereg,disp) \
|
||||
#define amd64_lea_membase_body(inst,reg,basereg,disp,width) \
|
||||
do { \
|
||||
amd64_emit_rex(inst, 8, (reg), 0, (basereg)); \
|
||||
amd64_emit_rex(inst, width, (reg), 0, (basereg)); \
|
||||
*(inst)++ = (unsigned char)0x8d; \
|
||||
amd64_membase_emit ((inst), (reg), (basereg), (disp)); \
|
||||
} while (0)
|
||||
|
||||
#define amd64_lea4_membase(inst,reg,basereg,disp) \
|
||||
amd64_lea_membase_body((inst), (reg), (basereg), (disp), 4)
|
||||
|
||||
#define amd64_lea_membase(inst,reg,basereg,disp) \
|
||||
amd64_lea_membase_body((inst), (reg), (basereg), (disp))
|
||||
amd64_lea_membase_body((inst), (reg), (basereg), (disp), 8)
|
||||
|
||||
/* Instruction are implicitly 64-bits so don't generate REX for just the size. */
|
||||
#define amd64_push_reg(inst,reg) \
|
||||
|
@ -336,6 +336,7 @@ x86_push_membase: src1:b len:8
|
||||
x86_push_obj: src1:b len:40
|
||||
x86_lea: dest:i src1:i src2:i len:8
|
||||
x86_lea_membase: dest:i src1:i len:11
|
||||
amd64_lea_membase: dest:i src1:i len:11
|
||||
x86_xchg: src1:i src2:i clob:x len:2
|
||||
x86_fpop: src1:f len:3
|
||||
x86_seteq_membase: src1:b len:9
|
||||
|
@ -1448,6 +1448,20 @@ class Tests
|
||||
var res = builder.Caller (ref awaiter);
|
||||
return res == typeof (bool) ? 0 : 1;
|
||||
}
|
||||
|
||||
struct OneThing<T1> {
|
||||
public T1 Item1;
|
||||
}
|
||||
|
||||
[MethodImpl (MethodImplOptions.NoInlining)]
|
||||
static T FromResult<T> (T result) {
|
||||
return result;
|
||||
}
|
||||
|
||||
public static int test_42_llvm_gsharedvt_small_vtype_in_regs () {
|
||||
var t = FromResult<OneThing<int>>(new OneThing<int> {Item1 = 42});
|
||||
return t.Item1;
|
||||
}
|
||||
}
|
||||
|
||||
#if !__MOBILE__
|
||||
|
@ -1 +1 @@
|
||||
dd89c329aa276333966129a913f446acfe56604d
|
||||
f67ad2be932ca3bf78cda19ab485d6525842594f
|
@ -1 +1 @@
|
||||
641b9dd12963f67fac0aa8bbfb38822afc9ab472
|
||||
638294138aed9f589ad06b654b5155d839b36999
|
@ -1178,6 +1178,7 @@ MINI_OP(OP_AMD64_AND_MEMBASE_IMM, "amd64_and_membase_imm", NONE, IREG, NO
|
||||
MINI_OP(OP_AMD64_OR_MEMBASE_IMM, "amd64_or_membase_imm", NONE, IREG, NONE)
|
||||
MINI_OP(OP_AMD64_XOR_MEMBASE_IMM, "amd64_xor_membase_imm", NONE, IREG, NONE)
|
||||
MINI_OP(OP_AMD64_MUL_MEMBASE_IMM, "amd64_mul_membase_imm", NONE, IREG, NONE)
|
||||
MINI_OP(OP_AMD64_LEA_MEMBASE, "amd64_lea_membase", IREG, IREG, NONE)
|
||||
|
||||
MINI_OP(OP_AMD64_ADD_REG_MEMBASE, "amd64_add_reg_membase", IREG, IREG, IREG)
|
||||
MINI_OP(OP_AMD64_SUB_REG_MEMBASE, "amd64_sub_reg_membase", IREG, IREG, IREG)
|
||||
|
@ -1 +1 @@
|
||||
b7ce24d3949d4ae2739d92cdf7156e46c67b3450
|
||||
73dbc300ffecc2b4d42391c347c10c52dd19f9cc
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/3a91530"
|
||||
#define FULL_VERSION "explicit/9e7fc6c"
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
9240fb521161e78ab1a978870df9cab7b7a0f5be
|
||||
1f5492b020f60e675d1a5497ff5279bce0066471
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
82e659148d0a31723e467faf0a7311000d9fa9c6
|
||||
f1a956f8469e4ae0784de4f8e1bf22f3ff719316
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
7cc9e48abb36e5cf08bab208531c6f64a235b927
|
||||
98dda341c4f9cfdecf61c749f797c247b6abaead
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.20.1.4\n"
|
||||
"Project-Id-Version: mono 5.20.1.6\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-03-22 08:08+0000\n"
|
||||
"POT-Creation-Date: 2019-03-27 08:07+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"
|
||||
|
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
4ae285bd5cc1e23994f25647d49b41a674ca62a7
|
||||
9ca9c1aa62f2e079df6d034435bbd5b3fa0c9336
|
Loading…
x
Reference in New Issue
Block a user