Author: steveire Date: Tue Jan 15 15:07:30 2019 New Revision: 351272 URL: http://llvm.org/viewvc/llvm-project?rev=351272&view=rev Log: Re-order type param children of ObjC nodes
Reviewers: aaron.ballman Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D55394 Modified: cfe/trunk/lib/AST/ASTDumper.cpp cfe/trunk/test/AST/ast-dump-decl.m Modified: cfe/trunk/lib/AST/ASTDumper.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTDumper.cpp?rev=351272&r1=351271&r2=351272&view=diff ============================================================================== --- cfe/trunk/lib/AST/ASTDumper.cpp (original) +++ cfe/trunk/lib/AST/ASTDumper.cpp Tue Jan 15 15:07:30 2019 @@ -1273,12 +1273,12 @@ void ASTDumper::VisitObjCTypeParamDecl(c 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(co 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) { Modified: cfe/trunk/test/AST/ast-dump-decl.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/AST/ast-dump-decl.m?rev=351272&r1=351271&r2=351272&view=diff ============================================================================== --- cfe/trunk/test/AST/ast-dump-decl.m (original) +++ cfe/trunk/test/AST/ast-dump-decl.m Tue Jan 15 15:07:30 2019 @@ -85,9 +85,9 @@ } @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 { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits