diff options
| author | Stephen Kelly <steveire@gmail.com> | 2019-01-15 23:07:30 +0000 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2019-01-15 23:07:30 +0000 |
| commit | 36f19cd8a562179f03e12859a792ff956f2fc637 (patch) | |
| tree | b8a01813f1045f19f4f01d4dbfe37e29c2e85caa | |
| parent | db47eebb0fa1a8c7bfcee6294aecd96478a841a8 (diff) | |
Re-order type param children of ObjC nodes
Reviewers: aaron.ballman
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D55394
| -rw-r--r-- | clang/lib/AST/ASTDumper.cpp | 4 | ||||
| -rw-r--r-- | clang/test/AST/ast-dump-decl.m | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/AST/ASTDumper.cpp b/clang/lib/AST/ASTDumper.cpp index 4dcd20e4f52..b52ec21943e 100644 --- a/clang/lib/AST/ASTDumper.cpp +++ b/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) { diff --git a/clang/test/AST/ast-dump-decl.m b/clang/test/AST/ast-dump-decl.m index c8ea1c3ec04..7f114dd7cb2 100644 --- a/clang/test/AST/ast-dump-decl.m +++ b/clang/test/AST/ast-dump-decl.m @@ -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 { |