Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -195,6 +195,7 @@ namespace Mono.ILASM {
keywords ["internalcall"] = new ILToken (Token.K_INTERNALCALL, "internalcall");
keywords ["synchronized"] = new ILToken (Token.K_SYNCHRONIZED, "synchronized");
keywords ["noinlining"] = new ILToken (Token.K_NOINLINING, "noinlining");
keywords ["nooptimization"] = new ILToken (Token.K_NOOPTIMIZATION, "nooptimization");
keywords ["custom"] = new ILToken (Token.K_CUSTOM, "custom");
keywords ["fixed"] = new ILToken (Token.K_FIXED, "fixed");
keywords ["sysstring"] = new ILToken (Token.K_SYSSTRING, "sysstring");

View File

@@ -56,10 +56,11 @@ namespace Mono.ILASM {
case OperandType.InlineNone:
token = Token.INSTR_NONE;
break;
#pragma warning disable 618
case OperandType.InlinePhi:
token = Token.INSTR_PHI;
break;
#pragma warning restore 618
case OperandType.InlineR:
case OperandType.ShortInlineR: