Imported Upstream version 6.8.0.75
Former-commit-id: 42d138b81eac476deaf0fe80cf71f28aa684f1a3
This commit is contained in:
parent
73ee7591e8
commit
c7e449e4b6
@ -1 +1 @@
|
||||
b8ba159bbd60b12015a3c0ea74f7436213e62335
|
||||
9b54510adbc10cd3c139b47b67c7d0a77cd42610
|
@ -1 +1 @@
|
||||
612e6f088c12dc8b2912628d2cfa6e5dcbe28a40
|
||||
299ab8496b5da270c09d90a38a83e0034dea9e3c
|
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.8.0.73";
|
||||
public const string MonoVersion = "6.8.0.75";
|
||||
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 @@
|
||||
10c199f6273088a52230ffe5240dab06dc79ef6a
|
||||
97a3d3487edcadf8b5ff47ee178a6ab893c66a1d
|
@ -1 +1 @@
|
||||
d7c75a5161e4dc77ff72514f81e5bcfee1f66f18
|
||||
95b0ba6bf7ff0be6954e344f34b611932d8c104f
|
@ -1 +1 @@
|
||||
97a131da135cdb88e3070994bfcb405182f0cc23
|
||||
0fb9bddccd107e8ec891f3a598d9d54fda158b02
|
@ -1 +1 @@
|
||||
5090147e0bd6549ca5cbf10241cacd11d023d17c
|
||||
78c81b46ce7339bb204c3edb19a4d0b5e305c93f
|
@ -1 +1 @@
|
||||
3529d3fc8f191980ad92d1191106ad14ea1e6f0b
|
||||
c79749a886e1ca02a3c968799f79d3bb09b3a632
|
@ -1 +1 @@
|
||||
5bf7ee680fde34b85692b0dfd2698af889ab8767
|
||||
96f4e9ffbec768480c8c7b28a45aff39c36ded32
|
@ -1 +1 @@
|
||||
4f01f6898ed1815cc48192ace724a80bcce666f8
|
||||
e38b96525f14599a9eb8fbb92253ea126df9e5a4
|
@ -1 +1 @@
|
||||
ea565b946160f2dab6d14029d989862bb8ad1293
|
||||
63a9364df5ba94e5b64da5a4a8c59459e2941415
|
@ -1 +1 @@
|
||||
10c199f6273088a52230ffe5240dab06dc79ef6a
|
||||
97a3d3487edcadf8b5ff47ee178a6ab893c66a1d
|
@ -1 +1 @@
|
||||
d7c75a5161e4dc77ff72514f81e5bcfee1f66f18
|
||||
95b0ba6bf7ff0be6954e344f34b611932d8c104f
|
@ -1 +1 @@
|
||||
97a131da135cdb88e3070994bfcb405182f0cc23
|
||||
0fb9bddccd107e8ec891f3a598d9d54fda158b02
|
@ -1 +1 @@
|
||||
5090147e0bd6549ca5cbf10241cacd11d023d17c
|
||||
78c81b46ce7339bb204c3edb19a4d0b5e305c93f
|
@ -1 +1 @@
|
||||
3529d3fc8f191980ad92d1191106ad14ea1e6f0b
|
||||
c79749a886e1ca02a3c968799f79d3bb09b3a632
|
@ -1 +1 @@
|
||||
5bf7ee680fde34b85692b0dfd2698af889ab8767
|
||||
96f4e9ffbec768480c8c7b28a45aff39c36ded32
|
@ -1 +1 @@
|
||||
4f01f6898ed1815cc48192ace724a80bcce666f8
|
||||
e38b96525f14599a9eb8fbb92253ea126df9e5a4
|
@ -1 +1 @@
|
||||
ea565b946160f2dab6d14029d989862bb8ad1293
|
||||
63a9364df5ba94e5b64da5a4a8c59459e2941415
|
@ -1 +1 @@
|
||||
10c199f6273088a52230ffe5240dab06dc79ef6a
|
||||
97a3d3487edcadf8b5ff47ee178a6ab893c66a1d
|
@ -1 +1 @@
|
||||
d7c75a5161e4dc77ff72514f81e5bcfee1f66f18
|
||||
95b0ba6bf7ff0be6954e344f34b611932d8c104f
|
@ -1 +1 @@
|
||||
97a131da135cdb88e3070994bfcb405182f0cc23
|
||||
0fb9bddccd107e8ec891f3a598d9d54fda158b02
|
@ -1 +1 @@
|
||||
5090147e0bd6549ca5cbf10241cacd11d023d17c
|
||||
78c81b46ce7339bb204c3edb19a4d0b5e305c93f
|
@ -1 +1 @@
|
||||
3529d3fc8f191980ad92d1191106ad14ea1e6f0b
|
||||
c79749a886e1ca02a3c968799f79d3bb09b3a632
|
@ -1 +1 @@
|
||||
5bf7ee680fde34b85692b0dfd2698af889ab8767
|
||||
96f4e9ffbec768480c8c7b28a45aff39c36ded32
|
@ -1 +1 @@
|
||||
4f01f6898ed1815cc48192ace724a80bcce666f8
|
||||
e38b96525f14599a9eb8fbb92253ea126df9e5a4
|
@ -1 +1 @@
|
||||
ea565b946160f2dab6d14029d989862bb8ad1293
|
||||
63a9364df5ba94e5b64da5a4a8c59459e2941415
|
@ -1 +1 @@
|
||||
10c199f6273088a52230ffe5240dab06dc79ef6a
|
||||
97a3d3487edcadf8b5ff47ee178a6ab893c66a1d
|
@ -1 +1 @@
|
||||
d7c75a5161e4dc77ff72514f81e5bcfee1f66f18
|
||||
95b0ba6bf7ff0be6954e344f34b611932d8c104f
|
@ -1 +1 @@
|
||||
3632d2cb0f353da9f0afa80bf2c3eae827386ab5
|
||||
56dc21ee5aba75387c5b86092e8d84debf937f4d
|
@ -1 +1 @@
|
||||
5090147e0bd6549ca5cbf10241cacd11d023d17c
|
||||
78c81b46ce7339bb204c3edb19a4d0b5e305c93f
|
@ -1 +1 @@
|
||||
3529d3fc8f191980ad92d1191106ad14ea1e6f0b
|
||||
c79749a886e1ca02a3c968799f79d3bb09b3a632
|
@ -1 +1 @@
|
||||
5bf7ee680fde34b85692b0dfd2698af889ab8767
|
||||
96f4e9ffbec768480c8c7b28a45aff39c36ded32
|
@ -1 +1 @@
|
||||
4f01f6898ed1815cc48192ace724a80bcce666f8
|
||||
e38b96525f14599a9eb8fbb92253ea126df9e5a4
|
@ -1 +1 @@
|
||||
07c246ad5b11f8c795f696149f3059cc86a761cd
|
||||
eeca871e9dc131477af6013e39053408a4df77bf
|
@ -1 +1 @@
|
||||
d167406e0407e102e668e6c1728f05dd093f6b4b
|
||||
d2beb23792045191c3aa4b72ac1d4e95c89cc3fa
|
@ -1142,7 +1142,15 @@ mono_delegate_trampoline (host_mgreg_t *regs, guint8 *code, gpointer *arg, guint
|
||||
}
|
||||
}
|
||||
|
||||
if (delegate->target &&
|
||||
if (tramp_info->method == NULL && delegate->target != NULL && method->flags & METHOD_ATTRIBUTE_VIRTUAL) {
|
||||
/* tramp_info->method == NULL happens when someone asks us to JIT some delegate's
|
||||
* Invoke method (see compile_special). In that case if method is virtual, the target
|
||||
* could be some derived class, so we need to find the correct override.
|
||||
*/
|
||||
/* FIXME: does it make sense that we get called with tramp_info for the Invoke? */
|
||||
method = mono_object_get_virtual_method_internal (delegate->target, method);
|
||||
enable_caching = FALSE;
|
||||
} else if (delegate->target &&
|
||||
method->flags & METHOD_ATTRIBUTE_VIRTUAL &&
|
||||
method->flags & METHOD_ATTRIBUTE_ABSTRACT &&
|
||||
mono_class_is_abstract (method->klass)) {
|
||||
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/77147e7"
|
||||
#define FULL_VERSION "explicit/e6cd9a1"
|
||||
|
@ -1 +1 @@
|
||||
bd41a1d045604694100460b314536e7b6b2e1796
|
||||
046ae211c02e7a9214df5eb62e04eba4173718fd
|
@ -1 +1 @@
|
||||
118f2591fc1db3ee021791b8b400f8c300bf21f2
|
||||
14e93764cea5ce7d67c6d59144319a6657b0abd9
|
42
mono/tests/delegate17.cs
Normal file
42
mono/tests/delegate17.cs
Normal file
@ -0,0 +1,42 @@
|
||||
using System;
|
||||
using System.Reflection;
|
||||
|
||||
internal class Program
|
||||
{
|
||||
public static int Main (string[] args)
|
||||
{
|
||||
// newobj Derived
|
||||
Derived d = new Derived ();
|
||||
// ldvirtftn Base::Foo
|
||||
// newobj Del1::.ctor
|
||||
Del1 b = new Del1 (d.Foo);
|
||||
// ldftn Del1::Invoke
|
||||
// newobj Del2::.ctor
|
||||
Del2 f = new Del2 (b.Invoke);
|
||||
// should call Derived.Foo not Base.Foo
|
||||
var r = f ("abcd");
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public delegate int Del1 (string s);
|
||||
public delegate int Del2 (string s);
|
||||
|
||||
public class Base
|
||||
{
|
||||
public virtual int Foo (string s)
|
||||
{
|
||||
Console.WriteLine ("Base.Foo called. Bad");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
public class Derived : Base
|
||||
{
|
||||
public override int Foo (string s)
|
||||
{
|
||||
Console.WriteLine ("Derived.Foo called. Good");
|
||||
return 0;
|
||||
}
|
||||
}
|
42
mono/tests/delegate18.cs
Normal file
42
mono/tests/delegate18.cs
Normal file
@ -0,0 +1,42 @@
|
||||
using System;
|
||||
using System.Reflection;
|
||||
|
||||
internal class Program
|
||||
{
|
||||
public static int Main (string[] args)
|
||||
{
|
||||
// newobj Derived
|
||||
Derived d = new Derived ();
|
||||
// ldvirtftn Base::Foo
|
||||
// newobj Del1::.ctor
|
||||
Del1 b = new Del1 (d.Foo);
|
||||
var mi = typeof (Del1).GetMethod ("Invoke");
|
||||
if (mi is null)
|
||||
return 2;
|
||||
// should call Derived.Foo not Base.Foo
|
||||
var r = (int) mi.Invoke (b, new object[] {"abcd"});
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public delegate int Del1 (string s);
|
||||
public delegate int Del2 (string s);
|
||||
|
||||
public class Base
|
||||
{
|
||||
public virtual int Foo (string s)
|
||||
{
|
||||
Console.WriteLine ("Base.Foo called. Bad");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
public class Derived : Base
|
||||
{
|
||||
public override int Foo (string s)
|
||||
{
|
||||
Console.WriteLine ("Derived.Foo called. Good");
|
||||
return 0;
|
||||
}
|
||||
}
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
b6bf9b9f8ab8fec37e17bb5278ebf4809f4c2b99
|
||||
1ce28d11bcff26de456d5d2a8e71bb2174c80d87
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
419f0f9511c43de6ff6d12e499ce6b1b03c20b13
|
||||
a0baa51d2e2caa7b0ac70e4e2d44a2e9f734279e
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
06544232f0b5e645c3353a96f2a40ba9591a7891
|
||||
59d2aec9715c662debaaac0b813854f71bc5e88e
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.8.0.73\n"
|
||||
"Project-Id-Version: mono 6.8.0.75\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-12-10 17:21+0000\n"
|
||||
"POT-Creation-Date: 2019-12-11 08:08+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 @@
|
||||
5acf09868278169e994b9b43ce5a1ea8c35a17f7
|
||||
20da82e2e10736f341079ba9ea798756e411a3c8
|
@ -962,8 +962,8 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
@ENABLE_MSVC_ONLY_FALSE@clean-local:
|
||||
@ENABLE_MSVC_ONLY_TRUE@test-bundle-local:
|
||||
@ENABLE_MSVC_ONLY_FALSE@clean-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \
|
||||
|
Loading…
x
Reference in New Issue
Block a user