Re-order type param children of ObjC nodes

Reviewers: aaron.ballman Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D55394 llvm-svn: 351272

Author: steveire

clang/lib/AST/ASTDumper.cpp

@@ -1273,12 +1273,12 @@ void ASTDumper::VisitObjCTypeParamDecl(const ObjCTypeParamDecl *D) {
 void ASTDumper::VisitObjCCategoryDecl(const ObjCCategoryDecl *D) {
  NodeDumper.dumpName(D);
  NodeDumper.dumpDeclRef(D->getClassInterface());
- dumpObjCTypeParamList(D->getTypeParamList());
  NodeDumper.dumpDeclRef(D->getImplementation());
  for (ObjCCategoryDecl::protocol_iterator I = D->protocol_begin(),
  E = D->protocol_end();
  I != E; ++I)
  NodeDumper.dumpDeclRef(*I);
+ dumpObjCTypeParamList(D->getTypeParamList());
 }
 
 void ASTDumper::VisitObjCCategoryImplDecl(const ObjCCategoryImplDecl *D) {
@@ -1296,12 +1296,12 @@ void ASTDumper::VisitObjCProtocolDecl(const ObjCProtocolDecl *D) {
 
 void ASTDumper::VisitObjCInterfaceDecl(const ObjCInterfaceDecl *D) {
  NodeDumper.dumpName(D);
- dumpObjCTypeParamList(D->getTypeParamListAsWritten());
  NodeDumper.dumpDeclRef(D->getSuperClass(), "super");
 
  NodeDumper.dumpDeclRef(D->getImplementation());
  for (auto *Child : D->protocols())
  NodeDumper.dumpDeclRef(Child);
+ dumpObjCTypeParamList(D->getTypeParamListAsWritten());
 }
 
 void ASTDumper::VisitObjCImplementationDecl(const ObjCImplementationDecl *D) {

clang/test/AST/ast-dump-decl.m

@@ -85,9 +85,9 @@ @interface TestGenericInterface<T> : A<P> {
 }
 @end
 // CHECK: ObjCInterfaceDecl{{.*}} TestGenericInterface
-// CHECK-NEXT: -ObjCTypeParamDecl {{.+}} <col:33> col:33 T 'id':'id'
 // CHECK-NEXT: -super ObjCInterface {{.+}} 'A'
 // CHECK-NEXT: -ObjCProtocol {{.+}} 'P'
+// CHECK-NEXT: -ObjCTypeParamDecl {{.+}} <col:33> col:33 T 'id':'id'
 
 @implementation TestObjCClass (TestObjCCategoryDecl)
 - (void) bar {