[llvm-branch-commits] [cfe-branch] r102083 - in /cfe/branches/Apple/williamson/lib: AST/ASTContext.cpp AST/RecordLayoutBuilder.cpp CodeGen/CGRecordLayoutBuilder.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Thu Apr 22 12:18:02 2010
New Revision: 102083

URL: http://llvm.org/viewvc/llvm-project?rev=102083&view=rev
Log:
AST: Dump ASTRecordLayout objects when they are created with -fdump-record-layouts.

Modified:
    cfe/branches/Apple/williamson/lib/AST/ASTContext.cpp
    cfe/branches/Apple/williamson/lib/AST/RecordLayoutBuilder.cpp
    cfe/branches/Apple/williamson/lib/CodeGen/CGRecordLayoutBuilder.cpp

Modified: cfe/branches/Apple/williamson/lib/AST/ASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/williamson/lib/AST/ASTContext.cpp?rev=102083&r1=102082&r2=102083&view=diff
==============================================================================
--- cfe/branches/Apple/williamson/lib/AST/ASTContext.cpp (original)
+++ cfe/branches/Apple/williamson/lib/AST/ASTContext.cpp Thu Apr 22 12:18:02 2010
@@ -998,6 +998,11 @@
     ASTRecordLayoutBuilder::ComputeLayout(*this, D);
   ASTRecordLayouts[D] = NewEntry;
 
+  if (getLangOptions().DumpRecordLayouts) {
+    llvm::errs() << "\n*** Dumping AST Record Layout\n";
+    DumpRecordLayout(D, llvm::errs());
+  }
+
   return *NewEntry;
 }
 

Modified: cfe/branches/Apple/williamson/lib/AST/RecordLayoutBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/williamson/lib/AST/RecordLayoutBuilder.cpp?rev=102083&r1=102082&r2=102083&view=diff
==============================================================================
--- cfe/branches/Apple/williamson/lib/AST/RecordLayoutBuilder.cpp (original)
+++ cfe/branches/Apple/williamson/lib/AST/RecordLayoutBuilder.cpp Thu Apr 22 12:18:02 2010
@@ -860,7 +860,7 @@
 ASTRecordLayoutBuilder::ComputeKeyFunction(const CXXRecordDecl *RD) {
   assert(RD->isDynamicClass() && "Class does not have any virtual methods!");
 
-  // If a class isnt' polymorphic it doesn't have a key function.
+  // If a class isn't polymorphic it doesn't have a key function.
   if (!RD->isPolymorphic())
     return 0;
 
@@ -984,6 +984,13 @@
                         "(primary virtual base)" : "(virtual base)",
                         /*IncludeVirtualBases=*/false);
   }
+
+  OS << "  sizeof=" << Info.getSize() / 8;
+  OS << ", dsize=" << Info.getDataSize() / 8;
+  OS << ", align=" << Info.getAlignment() / 8 << '\n';
+  OS << "  nvsize=" << Info.getNonVirtualSize() / 8;
+  OS << ", nvalign=" << Info.getNonVirtualAlign() / 8 << '\n';
+  OS << '\n';
 }
 
 void ASTContext::DumpRecordLayout(const RecordDecl *RD,
@@ -991,15 +998,21 @@
   const ASTRecordLayout &Info = getASTRecordLayout(RD);
 
   if (const CXXRecordDecl *CXXRD = dyn_cast<CXXRecordDecl>(RD))
-    DumpCXXRecordLayout(OS, CXXRD, *this, 0, 0, 0,
-                        /*IncludeVirtualBases=*/true);
-  else
-    OS << getTypeDeclType(RD).getAsString();
+    return DumpCXXRecordLayout(OS, CXXRD, *this, 0, 0, 0,
+                               /*IncludeVirtualBases=*/true);
 
-  OS << "  sizeof=" << Info.getSize() / 8;
-  OS << ", dsize=" << Info.getDataSize() / 8;
-  OS << ", align=" << Info.getAlignment() / 8 << '\n';
-  OS << "  nvsize=" << Info.getNonVirtualSize() / 8;
-  OS << ", nvalign=" << Info.getNonVirtualAlign() / 8 << '\n';
-  OS << '\n';
+  OS << "Type: " << getTypeDeclType(RD).getAsString() << "\n";
+  OS << "Record: ";
+  RD->dump();
+  OS << "\nLayout: ";
+  OS << "<ASTRecordLayout\n";
+  OS << "  Size:" << Info.getSize() << "\n";
+  OS << "  DataSize:" << Info.getDataSize() << "\n";
+  OS << "  Alignment:" << Info.getAlignment() << "\n";
+  OS << "  FieldOffsets: [";
+  for (unsigned i = 0, e = Info.getFieldCount(); i != e; ++i) {
+    if (i) OS << ", ";
+    OS << Info.getFieldOffset(i);
+  }
+  OS << "]>\n";
 }

Modified: cfe/branches/Apple/williamson/lib/CodeGen/CGRecordLayoutBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/williamson/lib/CodeGen/CGRecordLayoutBuilder.cpp?rev=102083&r1=102082&r2=102083&view=diff
==============================================================================
--- cfe/branches/Apple/williamson/lib/CodeGen/CGRecordLayoutBuilder.cpp (original)
+++ cfe/branches/Apple/williamson/lib/CodeGen/CGRecordLayoutBuilder.cpp Thu Apr 22 12:18:02 2010
@@ -566,7 +566,7 @@
 
   // Dump the layout, if requested.
   if (getContext().getLangOptions().DumpRecordLayouts) {
-    llvm::errs() << "\n*** Dumping Record Layout\n";
+    llvm::errs() << "\n*** Dumping IRgen Record Layout\n";
     llvm::errs() << "Record: ";
     D->dump();
     llvm::errs() << "\nLayout: ";