Fix copy pasta with the note

Author: AaronBallman

clang/lib/AST/ASTStructuralEquivalence.cpp

@@ -2126,7 +2126,8 @@ static bool IsStructurallyEquivalent(StructuralEquivalenceContext &Context,
                             diag::err_odr_tag_type_inconsistent))
               << Context.ToCtx.getTypeDeclType(D2)
               << (&Context.FromCtx != &Context.ToCtx);
-          Context.Diag2(D2->getLocation(), diag::note_odr_enumerator)
+          Context.Diag2(D2->getLocation(),
+                        diag::note_odr_incompatible_fixed_underlying_type)
               << D2 << D2->getIntegerType() << D1->getIntegerType();
         }
         return false;

clang/test/ASTMerge/enum/test2.c

@@ -11,6 +11,6 @@
 // CHECK: enum4.c:6:6: note: enumeration 'E2' has fixed underlying type here
 // CHECK: enum3.c:6:6: note: enumeration 'E2' missing fixed underlying type here
 // CHECK: enum3.c:11:6: warning: type 'enum E3' has incompatible definitions in different translation units
-// CHECK: enum3.c:11:6: note: enumerator 'E3' with value 'long' here
+// CHECK: enum3.c:11:6: note: enumeration 'E3' declared with incompatible fixed underlying types ('long' vs. 'short')
 // CHECK: 3 warnings and 1 error generated