Prefer user operators over predefined operators for binary enum opera…

…tions too. Fixes #13202

mcs/mcs/expression.cs

@@ -2752,6 +2752,12 @@ public Expression ResolveOperator (ResolveContext rc)
 				if (l.IsPointer || r.IsPointer)
 					return ResolveOperatorPointer (rc, l, r);
 
+				// User operators
+				expr = ResolveUserOperator (rc, left, right);
+				if (expr != null)
+					return expr;
+
+
 				bool lenum = l.IsEnum;
 				bool renum = r.IsEnum;
 				if ((oper & (Operator.ComparisonMask | Operator.BitwiseMask)) != 0) {
@@ -2805,11 +2811,6 @@ public Expression ResolveOperator (ResolveContext rc)
 							return expr;
 					}
 				}
-
-				// User operators
-				expr = ResolveUserOperator (rc, left, right);
-				if (expr != null)
-					return expr;
 			}
 
 			//

mcs/tests/test-869.cs

@@ -0,0 +1,39 @@
+using System;
+
+public class C
+{
+	public static readonly C Token = new C ();
+
+	public static C operator & (C set, E value)
+	{
+		return Token;
+	}
+
+	public static implicit operator E (C c)
+	{
+		throw new ApplicationException ();
+	}
+}
+
+public enum E
+{
+	Item = 2
+}
+
+class FooClass
+{
+	public static int Main ()
+	{
+		C m = new C ();
+		var x = E.Item;
+		var res = m & x;
+		if (res != C.Token)
+			return 1;
+
+		res = m & E.Item;
+		if (res != C.Token)
+			return 2;
+
+		return 0;	
+	}
+}

mcs/tests/ver-il-net_4_5.xml

@@ -47544,6 +47544,30 @@
       </method>
     </type>
   </test>
+  <test name="test-869.cs">
+    <type name="C">
+      <method name="C op_BitwiseAnd(C, E)" attrs="2198">
+        <size>14</size>
+      </method>
+      <method name="E op_Implicit(C)" attrs="2198">
+        <size>7</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+      <method name="Void .cctor()" attrs="6289">
+        <size>11</size>
+      </method>
+    </type>
+    <type name="FooClass">
+      <method name="Int32 Main()" attrs="150">
+        <size>70</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="test-87.cs">
     <type name="Top">
       <method name="Int32 Main()" attrs="150">