Imported Upstream version 4.2.1.36

Former-commit-id: fb75898888a02f4d3a74cf0a5b841681bc4c7fa8
This commit is contained in:
Xamarin Public Jenkins
2015-09-24 06:06:07 -04:00
committed by Jo Shields
parent 9668de7cb8
commit dd547c45d4
172 changed files with 6570 additions and 11015 deletions

View File

@@ -53,6 +53,7 @@ namespace IKVM.Internal
NoAutomagicSerialization = 32,
DisableDynamicBinding = 64,
NoRefEmitHelpers = 128,
RemoveUnusedFields = 256,
}
[Flags]
@@ -329,6 +330,14 @@ namespace IKVM.Internal
}
}
internal bool RemoveUnusedFields
{
get
{
return (codegenoptions & CodeGenOptions.RemoveUnusedFields) != 0;
}
}
internal bool WorkaroundAbstractMethodWidening
{
get
@@ -1486,6 +1495,10 @@ namespace IKVM.Internal
{
cfp |= ClassFileParseOptions.TrustedAnnotations;
}
if (RemoveAsserts)
{
cfp |= ClassFileParseOptions.RemoveAssertions;
}
return cfp;
#else
ClassFileParseOptions cfp = ClassFileParseOptions.LineNumberTable;