[CLANG] Added more tests, removed range assert

Author: DenisGZM

clang/lib/Parse/ParseStmt.cpp

@@ -263,11 +263,11 @@ StmtResult Parser::ParseStatementOrDeclarationAfterAttributes(
                                 GNUAttrs);
       }
       if (CXX11Attrs.Range.getBegin().isValid()) {
-        // The caller must guarantee that the CXX11Attrs appear before the
-        // GNUAttrs, and we rely on that here.
-        assert(GNUAttrs.Range.getBegin().isInvalid() ||
-               GNUAttrs.Range.getBegin() > CXX11Attrs.Range.getBegin());
-        DeclStart = CXX11Attrs.Range.getBegin();
+        // Order of C++11 and GNU attributes is may be arbitrary.
+        DeclStart = GNUAttrs.Range.getBegin().isInvalid()
+                        ? CXX11Attrs.Range.getBegin()
+                        : std::min(CXX11Attrs.Range.getBegin(),
+                                   GNUAttrs.Range.getBegin());
       } else if (GNUAttrs.Range.getBegin().isValid())
         DeclStart = GNUAttrs.Range.getBegin();
       return Actions.ActOnDeclStmt(Decl, DeclStart, DeclEnd);

clang/test/Parser/cxx0x-attributes.cpp

@@ -72,25 +72,30 @@ namespace test_misplacement {
 [[]] enum  E2 { }; //expected-error{{misplaced attributes}}
 }
 
-__attribute__(()) [[]] alignas(int) int xx; // expected-none
+__attribute__(()) alignas(int) int xx; // expected-none
 __attribute__(()) alignas(int) [[]] int yy; // expected-none
 [[]] __attribute__(()) alignas(int) int zz; // expected-none
 alignas(int) [[]] __attribute__(()) int aa; // expected-none
+[[]] alignas(int)  __attribute__(()) int bb; // expected-none
+__attribute__(()) [[]] alignas(int) int cc; // expected-none
 
 class C1 {
-  __attribute__(()) [[]] alignas(int) int x; // expected-none
+  __attribute__(()) alignas(int) int x; // expected-none
   __attribute__(()) alignas(int) [[]] int y; // expected-none
   [[]] __attribute__(()) alignas(int) int z; // expected-none
   alignas(int) [[]] __attribute__(()) int a; // expected-none
+  [[]] alignas(int)  __attribute__(()) int b; // expected-none
+  __attribute__(()) [[]] alignas(int) int c; // expected-none
 };
 
 void fn_with_decl() {
   __attribute__(()) alignas(int) int x; // expected-none
   __attribute__(()) alignas(int) [[]] int y; // expected-none
   [[]] __attribute__(()) alignas(int) int z; // expected-none
   alignas(int) [[]] __attribute__(()) int a; // expected-none
+  [[]] alignas(int)  __attribute__(()) int b; // expected-none
+  __attribute__(()) [[]] alignas(int) int c; // expected-none
 }
-
 // Checks attributes placed at wrong syntactic locations of class specifiers.
 class [[]] [[]]
   attr_after_class_name_decl [[]] [[]]; // expected-error {{an attribute list cannot appear here}}