Output: Fix output of forward-declared classes

When adding a dump node for a class, use the class definition, if
available, instead of the canonical declaration.  They may not be the
same when a class is forward-declared before it is defined.  We need to
use the definition to get all members.

1 files changed, 9 insertions, 2 deletions

diff --git a/src/Output.cxx b/src/Output.cxx
index c24c451..856a79b 100644
--- a/src/Output.cxx
+++ b/src/Output.cxx
@@ -380,6 +380,14 @@ public:
 
 //----------------------------------------------------------------------------
 unsigned int ASTVisitor::AddDumpNode(clang::Decl const* d, bool complete) {
+  // Select the definition or canonical declaration.
+  d = d->getCanonicalDecl();
+  if(clang::RecordDecl const* rd = clang::dyn_cast<clang::RecordDecl>(d)) {
+    if(clang::RecordDecl const* rdd = rd->getDefinition()) {
+      d = rdd;
+    }
+  }
+
   // Replace some decls with those they reference.
   switch (d->getKind()) {
   case clang::Decl::UsingShadow:
@@ -390,8 +398,7 @@ unsigned int ASTVisitor::AddDumpNode(clang::Decl const* d, bool complete) {
     break;
   }
 
-  // Add the node for the canonical declaration instance.
-  return this->AddDumpNodeImpl(d->getCanonicalDecl(), complete);
+  return this->AddDumpNodeImpl(d, complete);
 }
 
 //----------------------------------------------------------------------------