[typechecker] fix the check for two enums

Author: Suyash Srijan

lib/AST/Decl.cpp

@@ -2092,15 +2092,15 @@ bool swift::conflicting(ASTContext &ctx,
 
   // Functions and enum elements do not conflict with each other if their types
   // are different.
-  if ((sig1.IsFunction == sig2.IsEnumElement ||
-       sig1.IsEnumElement == sig2.IsFunction) &&
+  if (((sig1.IsFunction && sig2.IsEnumElement) ||
+       (sig1.IsEnumElement && sig2.IsFunction)) &&
       sig1Type != sig2Type) {
     return false;
   }
 
   // Enum elements always conflict with each other. At this point, they
   // have the same base name but different types.
-  if (sig1.IsEnumElement == sig2.IsEnumElement) {
+  if (sig1.IsEnumElement && sig2.IsEnumElement) {
     return true;
   }
 

test/decl/overload.swift

@@ -495,15 +495,15 @@ enum SR_10084_E {
 }
 
 enum SR_10084_E_1 {
-  static func foo(_ name: String) -> SR_10084_E_1 { // expected-note {{'foo' previously declared here}}
+  static func foo(_ name: String) -> SR_10084_E_1 {
     return .foo(SR_10084_S(name: name))
   }
 
-  static func foo(_ value: SR_10084_S) -> SR_10084_E_1 { // expected-error {{invalid redeclaration of 'foo'}}
+  static func foo(_ value: SR_10084_S) -> SR_10084_E_1 { // expected-note {{'foo' previously declared here}}
     return .foo(value)
   }
 
-  case foo(SR_10084_S)
+  case foo(SR_10084_S) // expected-error {{invalid redeclaration of 'foo'}}
 }
 
 enum SR_10084_E_2 {