diff options
| -rw-r--r-- | lib/Frontend/ASTConsumers.cpp | 4 | ||||
| -rw-r--r-- | test/Tooling/clang-check-ast-dump.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/Frontend/ASTConsumers.cpp b/lib/Frontend/ASTConsumers.cpp index 4a8f88f328..882d400c42 100644 --- a/lib/Frontend/ASTConsumers.cpp +++ b/lib/Frontend/ASTConsumers.cpp @@ -58,9 +58,7 @@ namespace { bool shouldWalkTypesOfTypeLocs() const { return false; } bool TraverseDecl(Decl *D) { - if (D == NULL) - return false; - if (filterMatches(D)) { + if (D != NULL && filterMatches(D)) { Out.changeColor(llvm::raw_ostream::BLUE) << (Dump ? "Dumping " : "Printing ") << getName(D) << ":\n"; Out.resetColor(); diff --git a/test/Tooling/clang-check-ast-dump.cpp b/test/Tooling/clang-check-ast-dump.cpp index 28dcc6eaa8..43686bd250 100644 --- a/test/Tooling/clang-check-ast-dump.cpp +++ b/test/Tooling/clang-check-ast-dump.cpp @@ -26,6 +26,9 @@ // RUN: clang-check -ast-dump -ast-dump-filter test_namespace::TheClass::n "%s" -- 2>&1 | FileCheck -check-prefix CHECK-ATTR %s // CHECK-ATTR: test_namespace // CHECK-ATTR-NEXT: int n __attribute__((aligned((BinaryOperator +// +// RUN: clang-check -ast-dump -ast-dump-filter test_namespace::AfterNullNode "%s" -- 2>&1 | FileCheck -check-prefix CHECK-AFTER-NULL %s +// CHECK-AFTER-NULL: class AfterNullNode namespace test_namespace { @@ -40,4 +43,7 @@ public: // Used to fail with -ast-dump-filter X template<template<typename T> class C> class Z {}; +// Check that traversal continues after the previous construct. +class AfterNullNode {}; + } |