Add missing ref emit enum members for ns2.0 (dotnet/coreclr#8062)

Commit migrated from https://github.com/dotnet/coreclr/commit/570530b69106f4523ead97697e22674e02769643

diff --git a/src/coreclr/src/mscorlib/model.xml b/src/coreclr/src/mscorlib/model.xml
index 76f586f..95284d5 100644 (file)
--- a/src/coreclr/src/mscorlib/model.xml
+++ b/src/coreclr/src/mscorlib/model.xml
@@ -4666,6 +4666,7 @@
       <Member MemberType="Field" Name="Cond_Branch" />
       <Member MemberType="Field" Name="Meta" />
       <Member MemberType="Field" Name="Next" />
+      <Member MemberType="Field" Name="Phi" />
       <Member MemberType="Field" Name="Return" />
       <Member MemberType="Field" Name="Throw" />
       <Member MemberType="Field" Name="value__" />
@@ -5184,6 +5185,7 @@
       <Member Name="TakesSingleByteArgument(System.Reflection.Emit.OpCode)" />
     </Type>
     <Type Name="System.Reflection.Emit.OpCodeType">
+      <Member MemberType="Field" Name="Annotation" />
       <Member MemberType="Field" Name="Macro" />
       <Member MemberType="Field" Name="Nternal" />
       <Member MemberType="Field" Name="Objmodel" />
@@ -5198,6 +5200,7 @@
       <Member MemberType="Field" Name="InlineI8" />
       <Member MemberType="Field" Name="InlineMethod" />
       <Member MemberType="Field" Name="InlineNone" />
+      <Member MemberType="Field" Name="InlinePhi" />
       <Member MemberType="Field" Name="InlineR" />
       <Member MemberType="Field" Name="InlineSig" />
       <Member MemberType="Field" Name="InlineString" />

diff --git a/src/coreclr/src/mscorlib/ref/mscorlib.cs b/src/coreclr/src/mscorlib/ref/mscorlib.cs
index 09e2905..1b6611c 100644 (file)
--- a/src/coreclr/src/mscorlib/ref/mscorlib.cs
+++ b/src/coreclr/src/mscorlib/ref/mscorlib.cs
@@ -8778,6 +8778,8 @@ namespace System.Reflection.Emit
         Cond_Branch = 3,
         Meta = 4,
         Next = 5,
+        [Obsolete("This API has been deprecated. http://go.microsoft.com/fwlink/?linkid=14202")]
+        Phi = 6,
         Return = 7,
         Throw = 8,
     }
@@ -9340,6 +9342,8 @@ namespace System.Reflection.Emit
     [System.Runtime.InteropServices.ComVisibleAttribute(true)]
     public enum OpCodeType
     {
+        [Obsolete("This API has been deprecated. http://go.microsoft.com/fwlink/?linkid=14202")]
+        Annotation = 0,
         Macro = 1,
         Nternal = 2,
         Objmodel = 3,
@@ -9355,6 +9359,8 @@ namespace System.Reflection.Emit
         InlineI8 = 3,
         InlineMethod = 4,
         InlineNone = 5,
+        [Obsolete("This API has been deprecated. http://go.microsoft.com/fwlink/?linkid=14202")]
+        InlinePhi = 6,
         InlineR = 7,
         InlineSig = 9,
         InlineString = 10,

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/FlowControl.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/FlowControl.cs
index 5bfe5bb..31bb564 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/FlowControl.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/FlowControl.cs
@@ -26,11 +26,8 @@ public enum FlowControl
     Cond_Branch  = 3,
     Meta         = 4,
     Next         = 5,
-#if !FEATURE_CORECLR
-    /// <internalonly/>
     [Obsolete("This API has been deprecated. http://go.microsoft.com/fwlink/?linkid=14202")]
     Phi          = 6,
-#endif
     Return       = 7,
     Throw        = 8,
 }

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/OpcodeType.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/OpcodeType.cs
index 5ef5f80..3636cb7 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/OpcodeType.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/OpcodeType.cs
@@ -21,11 +21,8 @@ using System;
 public enum OpCodeType
 {
 
-#if !FEATURE_CORECLR
-    /// <internalonly/>
     [Obsolete("This API has been deprecated. http://go.microsoft.com/fwlink/?linkid=14202")]
     Annotation  = 0,
-#endif
     Macro       = 1,
     Nternal     = 2,
     Objmodel    = 3,

diff --git a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/OperandType.cs b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/OperandType.cs
index fdde19a..808844a 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Reflection/Emit/OperandType.cs
+++ b/src/coreclr/src/mscorlib/src/System/Reflection/Emit/OperandType.cs
@@ -27,11 +27,8 @@ public enum OperandType
     InlineI8        = 3,
     InlineMethod    = 4,
     InlineNone      = 5,
-#if !FEATURE_CORECLR
-    /// <internalonly/>
     [Obsolete("This API has been deprecated. http://go.microsoft.com/fwlink/?linkid=14202")]
     InlinePhi       = 6,
-#endif
     InlineR         = 7,
     InlineSig       = 9,
     InlineString    = 10,