diff --git a/clang/include/clang/AST/ASTNodeTraverser.h b/clang/include/clang/AST/ASTNodeTraverser.h
--- a/clang/include/clang/AST/ASTNodeTraverser.h
+++ b/clang/include/clang/AST/ASTNodeTraverser.h
@@ -130,9 +130,9 @@
 
   void Visit(const Type *T) {
     getNodeDelegate().AddChild([=] {
-      getNodeDelegate().Visit(T);
       if (!T)
         return;
+      getNodeDelegate().Visit(T);
       TypeVisitor<Derived>::Visit(T);
 
       QualType SingleStepDesugar =