Imported Upstream version 6.0.0.172

Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-12 14:10:50 +00:00
parent 8016999e4d
commit 64ac736ec5
32155 changed files with 3981439 additions and 75368 deletions

View File

@ -31,7 +31,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if !FULL_AOT_RUNTIME
#if MONO_FEATURE_SRE
using System;
using System.Reflection;
@ -66,7 +66,7 @@ namespace System.Reflection.Emit {
#pragma warning restore 169, 414, 649
private Delegate deleg;
private MonoMethod method;
private RuntimeMethodInfo method;
private ParameterBuilder[] pinfo;
internal bool creating;
private DynamicILInfo il_info;
@ -264,7 +264,7 @@ namespace System.Reflection.Emit {
ParameterInfo[] retval = new ParameterInfo [parameters.Length];
for (int i = 0; i < parameters.Length; i++) {
retval [i] = MonoParameterInfo.New (pinfo?[i + 1], parameters [i], this, i + 1);
retval [i] = RuntimeParameterInfo.New (pinfo?[i + 1], parameters [i], this, i + 1);
}
return retval;
}
@ -282,7 +282,7 @@ namespace System.Reflection.Emit {
public override object Invoke (object obj, object[] parameters) {
CreateDynMethod ();
if (method == null)
method = new MonoMethod (mhandle);
method = new RuntimeMethodInfo (mhandle);
return method.Invoke (obj, parameters);
}
*/
@ -294,7 +294,7 @@ namespace System.Reflection.Emit {
try {
CreateDynMethod ();
if (method == null)
method = new MonoMethod (mhandle);
method = new RuntimeMethodInfo (mhandle);
return method.Invoke (obj, invokeAttr, binder, parameters, culture);
}
@ -424,8 +424,9 @@ namespace System.Reflection.Emit {
}
// This class takes care of constructing the module in a thread safe manner
class AnonHostModuleHolder {
public static Module anon_host_module;
static class AnonHostModuleHolder
{
public static readonly Module anon_host_module;
static AnonHostModuleHolder () {
AssemblyName aname = new AssemblyName ();