track enum key source range in EnumDecl

Author: a-tarasyuk

clang/include/clang/AST/Decl.h

@@ -4040,6 +4040,11 @@ class EnumDecl : public TagDecl {
   /// and can be accessed with the provided accessors.
   unsigned ODRHash;
 
+  /// Source range covering the enum key:
+  ///  - 'enum'              (unscoped)
+  ///  - 'enum class|struct' (scoped)
+  SourceRange EnumKeyRange;
+
   EnumDecl(ASTContext &C, DeclContext *DC, SourceLocation StartLoc,
            SourceLocation IdLoc, IdentifierInfo *Id, EnumDecl *PrevDecl,
            bool Scoped, bool ScopedUsingClassTag, bool Fixed);
@@ -4077,6 +4082,10 @@ class EnumDecl : public TagDecl {
   /// Microsoft-style enumeration with a fixed underlying type.
   void setFixed(bool Fixed = true) { EnumDeclBits.IsFixed = Fixed; }
 
+  SourceRange getEnumKeyRange() const { return EnumKeyRange; }
+
+  void setEnumKeyRange(SourceRange Range) { EnumKeyRange = Range; }
+
 private:
   /// True if a valid hash is stored in ODRHash.
   bool hasODRHash() const { return EnumDeclBits.HasODRHash; }

clang/lib/Parse/Parser.cpp

@@ -1107,16 +1107,8 @@ Parser::DeclGroupPtrTy Parser::ParseDeclOrFunctionDefInternal(
     if (DeclSpec::isDeclRep(TKind)) {
       if (TKind == DeclSpec::TST_enum) {
         if (const auto *ED = dyn_cast_or_null<EnumDecl>(DS.getRepAsDecl())) {
-          if (ED->getIdentifier()) {
-            CorrectLocationForAttributes = ED->getLocation();
-          } else {
-            SourceLocation Begin = ED->getBraceRange().getBegin();
-            CorrectLocationForAttributes =
-                Begin.isValid() ? Begin :
-                                // If there is no brace, fall back to the end
-                                // location, which corresponds to the semicolon.
-                    ED->getEndLoc();
-          }
+          CorrectLocationForAttributes =
+              PP.getLocForEndOfToken(ED->getEnumKeyRange().getEnd());
         }
       }
       if (CorrectLocationForAttributes.isInvalid()) {

clang/lib/Sema/SemaDecl.cpp

@@ -18457,17 +18457,21 @@ Sema::ActOnTag(Scope *S, unsigned TagSpec, TagUseKind TUK, SourceLocation KWLoc,
                            cast_or_null<EnumDecl>(PrevDecl), ScopedEnum,
                            ScopedEnumUsesClassTag, IsFixed);
 
+    EnumDecl *ED = cast<EnumDecl>(New);
+    ED->setEnumKeyRange(SourceRange(
+        KWLoc, ScopedEnumKWLoc.isValid() ? ScopedEnumKWLoc : KWLoc));
+
     if (isStdAlignValT && (!StdAlignValT || getStdAlignValT()->isImplicit()))
       StdAlignValT = cast<EnumDecl>(New);
 
     // If this is an undefined enum, warn.
     if (TUK != TagUseKind::Definition && !Invalid) {
       TagDecl *Def;
-      if (IsFixed && cast<EnumDecl>(New)->isFixed()) {
+      if (IsFixed && ED->isFixed()) {
         // C++0x: 7.2p2: opaque-enum-declaration.
         // Conflicts are diagnosed above. Do nothing.
-      }
-      else if (PrevDecl && (Def = cast<EnumDecl>(PrevDecl)->getDefinition())) {
+      } else if (PrevDecl &&
+                 (Def = cast<EnumDecl>(PrevDecl)->getDefinition())) {
         Diag(Loc, diag::ext_forward_ref_enum_def)
           << New;
         Diag(Def->getLocation(), diag::note_previous_definition);

clang/test/FixIt/fixit-cxx0x-attributes.cpp

@@ -4,34 +4,45 @@
 [[nodiscard]] enum class E1 { };
 // expected-error@-1 {{misplaced attributes; expected attributes here}}
 // CHECK: {{^}}{{\[\[}}nodiscard]] enum class E1 { };
-// CHECK: {{^}}~~~~~~~~~~~~~            ^
+// CHECK: {{^}}~~~~~~~~~~~~~           ^
 // CHECK: fix-it:"{{.*}}":{[[@LINE-4]]:1-[[@LINE-4]]:15}:""
-// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:26-[[@LINE-5]]:26}:"{{\[\[}}nodiscard]]"
+// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:25-[[@LINE-5]]:25}:"{{\[\[}}nodiscard]]"
 
 [[nodiscard]] enum struct E2 { };
 // expected-error@-1 {{misplaced attributes; expected attributes here}}
 // CHECK: {{^}}{{\[\[}}nodiscard]] enum struct E2 { };
-// CHECK: {{^}}~~~~~~~~~~~~~             ^
+// CHECK: {{^}}~~~~~~~~~~~~~            ^
 // CHECK: fix-it:"{{.*}}":{[[@LINE-4]]:1-[[@LINE-4]]:15}:""
-// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:27-[[@LINE-5]]:27}:"{{\[\[}}nodiscard]]"
+// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:26-[[@LINE-5]]:26}:"{{\[\[}}nodiscard]]"
 
 [[nodiscard]] enum          class E3 { };
 // expected-error@-1 {{misplaced attributes; expected attributes here}}
 // CHECK: {{^}}{{\[\[}}nodiscard]] enum          class E3 { };
-// CHECK: {{^}}~~~~~~~~~~~~~                     ^
+// CHECK: {{^}}~~~~~~~~~~~~~                    ^
 // CHECK: fix-it:"{{.*}}":{[[@LINE-4]]:1-[[@LINE-4]]:15}:""
-// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:35-[[@LINE-5]]:35}:"{{\[\[}}nodiscard]]"
+// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:34-[[@LINE-5]]:34}:"{{\[\[}}nodiscard]]"
 
 [[nodiscard]] enum  /*comment*/ class E4 { };
 // expected-error@-1 {{misplaced attributes; expected attributes here}}
 // CHECK: {{^}}{{\[\[}}nodiscard]] enum  /*comment*/ class E4 { };
-// CHECK: {{^}}~~~~~~~~~~~~~                         ^
+// CHECK: {{^}}~~~~~~~~~~~~~                        ^
 // CHECK: fix-it:"{{.*}}":{[[@LINE-4]]:1-[[@LINE-4]]:15}:""
-// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:39-[[@LINE-5]]:39}:"{{\[\[}}nodiscard]]"
+// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:38-[[@LINE-5]]:38}:"{{\[\[}}nodiscard]]"
 
 [[nodiscard]] enum { A = 0 };
 // expected-error@-1 {{misplaced attributes; expected attributes here}}
 // CHECK: {{^}}{{\[\[}}nodiscard]] enum { A = 0 };
-// CHECK: {{^}}~~~~~~~~~~~~~      ^
+// CHECK: {{^}}~~~~~~~~~~~~~     ^
+// CHECK: fix-it:"{{.*}}":{[[@LINE-4]]:1-[[@LINE-4]]:15}:""
+// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:19-[[@LINE-5]]:19}:"{{\[\[}}nodiscard]]"
+
+namespace NS {
+  enum class E5;
+}
+
+[[nodiscard]] enum class NS::E5 { };
+// expected-error@-1 {{misplaced attributes; expected attributes here}}
+// CHECK: {{^}}{{\[\[}}nodiscard]] enum class NS::E5 { };
+// CHECK: {{^}}~~~~~~~~~~~~~           ^
 // CHECK: fix-it:"{{.*}}":{[[@LINE-4]]:1-[[@LINE-4]]:15}:""
-// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:20-[[@LINE-5]]:20}:"{{\[\[}}nodiscard]]"
+// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:25-[[@LINE-5]]:25}:"{{\[\[}}nodiscard]]"