Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Varga <vargaz@gmail.com>2015-09-20 21:56:37 +0300
committerZoltan Varga <vargaz@gmail.com>2015-09-20 21:57:18 +0300
commit3b0d49736f6d4a36cc35b5f1ff5e2a5227563423 (patch)
tree003dff7a2e64567e4a842584807d3f1ae6e66dd7
parent5c4305818c0893c596f87c90b41e9b7df87bc404 (diff)
Add an 'rgctx' field to MonoDelegate, not yet used.
-rw-r--r--mcs/class/corlib/System/Delegate.cs1
-rw-r--r--mcs/class/corlib/System/Environment.cs2
-rw-r--r--mono/metadata/appdomain.c2
-rw-r--r--mono/metadata/object-internals.h1
4 files changed, 4 insertions, 2 deletions
diff --git a/mcs/class/corlib/System/Delegate.cs b/mcs/class/corlib/System/Delegate.cs
index c661760e8d0..91eecdccb93 100644
--- a/mcs/class/corlib/System/Delegate.cs
+++ b/mcs/class/corlib/System/Delegate.cs
@@ -60,6 +60,7 @@ namespace System
private object m_target;
private IntPtr method;
private IntPtr delegate_trampoline;
+ private IntPtr rgctx;
private IntPtr method_code;
private MethodInfo method_info;
diff --git a/mcs/class/corlib/System/Environment.cs b/mcs/class/corlib/System/Environment.cs
index ee00b14c338..d9267ac3230 100644
--- a/mcs/class/corlib/System/Environment.cs
+++ b/mcs/class/corlib/System/Environment.cs
@@ -57,7 +57,7 @@ namespace System {
* of icalls, do not require an increment.
*/
#pragma warning disable 169
- private const int mono_corlib_version = 137;
+ private const int mono_corlib_version = 138;
#pragma warning restore 169
[ComVisible (true)]
diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index c456937c98a..230bff2e2ec 100644
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -79,7 +79,7 @@
* Changes which are already detected at runtime, like the addition
* of icalls, do not require an increment.
*/
-#define MONO_CORLIB_VERSION 137
+#define MONO_CORLIB_VERSION 138
typedef struct
{
diff --git a/mono/metadata/object-internals.h b/mono/metadata/object-internals.h
index 9860f379330..785e01dd280 100644
--- a/mono/metadata/object-internals.h
+++ b/mono/metadata/object-internals.h
@@ -778,6 +778,7 @@ struct _MonoDelegate {
MonoObject *target;
MonoMethod *method;
gpointer delegate_trampoline;
+ gpointer rgctx;
/*
* If non-NULL, this points to a memory location which stores the address of
* the compiled code of the method, or NULL if it is not yet compiled.