derive enum attribute locations from EnumDecl instead of Lexer

Author: a-tarasyuk

clang/lib/Parse/Parser.cpp

@@ -1107,14 +1107,13 @@ Parser::DeclGroupPtrTy Parser::ParseDeclOrFunctionDefInternal(
 
       if (TKind == DeclSpec::TST_enum) {
         const auto *ED = dyn_cast_or_null<EnumDecl>(DS.getRepAsDecl());
-        if (ED && ED->isScoped()) {
-          const auto &SM = Actions.getSourceManager();
-          const auto &LangOpts = Actions.getLangOpts();
-          auto End = Lexer::getLocForEndOfToken(DS.getTypeSpecTypeLoc(),
-                                                /*Offset*/ 0, SM, LangOpts);
-          auto NextToken = Lexer::findNextToken(End, SM, LangOpts);
-          if (NextToken)
-            return NextToken->getEndLoc();
+        if (ED) {
+          if (ED->isScoped() && ED->getIdentifier())
+            return ED->getLocation();
+
+          const auto Begin = ED->getBraceRange().getBegin();
+          if (Begin.isValid())
+            return Begin;
         }
       }
 

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

@@ -4,27 +4,34 @@
 [[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]]:25-[[@LINE-5]]:25}:"{{\[\[}}nodiscard]]"
+// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:26-[[@LINE-5]]:26}:"{{\[\[}}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]]:26-[[@LINE-5]]:26}:"{{\[\[}}nodiscard]]"
+// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:27-[[@LINE-5]]:27}:"{{\[\[}}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]]:34-[[@LINE-5]]:34}:"{{\[\[}}nodiscard]]"
+// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:35-[[@LINE-5]]:35}:"{{\[\[}}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]]"
+
+[[nodiscard]] enum { A = 0 };
+// expected-error@-1 {{misplaced attributes; expected attributes here}}
+// CHECK: {{^}}{{\[\[}}nodiscard]] enum { A = 0 };
+// CHECK: {{^}}~~~~~~~~~~~~~      ^
 // CHECK: fix-it:"{{.*}}":{[[@LINE-4]]:1-[[@LINE-4]]:15}:""
-// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:38-[[@LINE-5]]:38}:"{{\[\[}}nodiscard]]"
+// CHECK: fix-it:"{{.*}}":{[[@LINE-5]]:20-[[@LINE-5]]:20}:"{{\[\[}}nodiscard]]"