From 0a2754ed8a9ee2a6e1dfd075cc46a1c525acb7c6 Mon Sep 17 00:00:00 2001
From: Mike Stump <mrs@apple.com>
Date: Fri, 22 Jan 2010 20:27:17 +0000
Subject: [PATCH] Be sure to select primary bases among the nearly empties in
 preorder, not just among the direct bases.  Before we where missing nearly
 empties that were bases of virtual base classes.

llvm-svn: 94208
---
 clang/lib/AST/RecordLayoutBuilder.cpp |  5 ++++
 clang/test/CodeGenCXX/virt.cpp        | 39 +++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp
index cfd89eaed350..0aa01801959c 100644
--- a/clang/lib/AST/RecordLayoutBuilder.cpp
+++ b/clang/lib/AST/RecordLayoutBuilder.cpp
@@ -119,6 +119,11 @@ ASTRecordLayoutBuilder::SelectPrimaryVBase(const CXXRecordDecl *RD,
         return;
       }
     }
+    if (i->isVirtual()) {
+      SelectPrimaryVBase(Base, FirstPrimary);
+      if (PrimaryBase.getBase())
+        return;
+    }
   }
 }
 
diff --git a/clang/test/CodeGenCXX/virt.cpp b/clang/test/CodeGenCXX/virt.cpp
index 2717d6cf94e6..c1cf03609c5a 100644
--- a/clang/test/CodeGenCXX/virt.cpp
+++ b/clang/test/CodeGenCXX/virt.cpp
@@ -1091,6 +1091,45 @@ struct test22_D : test22_s3 { virtual void dtor() { } };
 // CHECK-LP64-NEXT:        .quad   __ZThn8_N8test22_D4dtorEv
 
 
+class test23_s1 {
+  virtual void fun1(char *t) { }
+};
+class test23_s2 {
+  virtual void fun2(char *t) { }
+};
+class test23_s3 {
+  virtual void fun3(char *t) { }
+};
+class test23_s4: virtual test23_s1, test23_s2, test23_s3 {
+  virtual void fun4(char *t) { }
+};
+class test23_D: virtual test23_s4 {
+  virtual void fun5(char *t) { }
+};
+
+
+// CHECK-LP64:     __ZTV8test23_D:
+// CHECK-LP64-NEXT:	.quad	0
+// CHECK-LP64-NEXT:	.quad	8
+// CHECK-LP64-NEXT:	.quad	0
+// CHECK-LP64-NEXT:	.quad	0
+// CHECK-LP64-NEXT:	.quad	__ZTI8test23_D
+// CHECK-LP64-NEXT:	.quad	__ZN9test23_s14fun1EPc
+// CHECK-LP64-NEXT:	.quad	__ZN8test23_D4fun5EPc
+// CHECK-LP64-NEXT	.quad	8
+// CHECK-LP64:  	.quad	0
+// CHECK-LP64-NEXT:	.quad	0
+// CHECK-LP64:  	.quad	18446744073709551608
+// CHECK-LP64-NEXT:	.quad	18446744073709551608
+// CHECK-LP64-NEXT:	.quad	__ZTI8test23_D
+// CHECK-LP64-NEXT:	.quad	__ZN9test23_s24fun2EPc
+// CHECK-LP64-NEXT:	.quad	__ZN9test23_s44fun4EPc
+// CHECK-LP64-NEXT:	.quad	18446744073709551600
+// CHECK-LP64-NEXT:	.quad	__ZTI8test23_D
+// CHECK-LP64-NEXT:	.quad	__ZN9test23_s34fun3EPc
+
+
+test23_D d23;
 test22_D d22;
 test21_D d21;
 test20_D d20;