Merged r177729 through r177731 into branch.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/x32@177748 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 40 insertions, 2 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3aa3a5d7a38..b600d256a6e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-12  David Li  <davidxl@google.com>
+
+	* cp/class.c (update_vtable_entry_for_fn): Set
+	LOST_PRIMARY bit properly.
+
 2011-08-12  Richard Henderson  <rth@redhat.com>
 
 	PR rtl-opt/49994
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 26b7abe903d..fd0f011d0ae 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -2294,8 +2294,7 @@ update_vtable_entry_for_fn (tree t, tree binfo, tree fn, tree* virtuals,
   else
     BV_VCALL_INDEX (*virtuals) = NULL_TREE;
 
-  if (lost)
-    BV_LOST_PRIMARY (*virtuals) = true;
+  BV_LOST_PRIMARY (*virtuals) = lost;
 }
 
 /* Called from modify_all_vtables via dfs_walk.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4cede20faeb..65097a3abde 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-12  David Li  <davidxl@google.com>
+
+	* g++.dg/abi/vbase15.C: New test.
+
 2011-08-12  Jason Merrill  <jason@redhat.com>
 
 	PR c++/50034
diff --git a/gcc/testsuite/g++.dg/abi/vbase15.C b/gcc/testsuite/g++.dg/abi/vbase15.C
new file mode 100644
index 00000000000..a0908f40e54
--- /dev/null
+++ b/gcc/testsuite/g++.dg/abi/vbase15.C
@@ -0,0 +1,30 @@
+ // { dg-do run }
+
+struct Spec
+
+{
+ virtual int id () const = 0;
+};
+class D1_1_Spec :  public virtual Spec { };
+class D1_2_Spec :  public virtual Spec { };
+class D1_3_Spec :  public virtual Spec { };
+class D2_1_Spec : public D1_1_Spec, public D1_2_Spec { };
+class D2_Spec : public virtual D2_1_Spec, public virtual D1_3_Spec { };
+
+struct D3_Spec : public D2_Spec
+{
+ virtual int id () const { return 3; }
+
+};
+
+__attribute__((noinline)) void foo(D3_Spec* spec)
+{
+  spec->id();
+}
+
+int main()
+{
+ D3_Spec spec;
+ foo(&spec);
+ return 0;
+}