Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -364,7 +364,22 @@ namespace System.Reflection.Emit
if (ilgen != null)
ilgen.label_fixup (this);
}
internal void ResolveUserTypes () {
rtype = TypeBuilder.ResolveUserType (rtype);
TypeBuilder.ResolveUserTypes (parameters);
TypeBuilder.ResolveUserTypes (returnModReq);
TypeBuilder.ResolveUserTypes (returnModOpt);
if (paramModReq != null) {
foreach (var types in paramModReq)
TypeBuilder.ResolveUserTypes (types);
}
if (paramModOpt != null) {
foreach (var types in paramModOpt)
TypeBuilder.ResolveUserTypes (types);
}
}
internal void GenerateDebugInfo (ISymbolWriter symbolWriter)
{
if (ilgen != null && ilgen.HasDebugInfo) {
@@ -478,7 +493,7 @@ namespace System.Reflection.Emit
public void AddDeclarativeSecurity (SecurityAction action, PermissionSet pset)
{
#if !NET_2_1
#if !MOBILE
if (pset == null)
throw new ArgumentNullException ("pset");
if ((action == SecurityAction.RequestMinimum) ||