https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103681
--- Comment #5 from CVS Commits <cvs-commit at gcc dot gnu.org> --- The master branch has been updated by Jason Merrill <ja...@gcc.gnu.org>: https://gcc.gnu.org/g:23be9f83bbd2c6f03580757adbfe599de6bf702b commit r12-6800-g23be9f83bbd2c6f03580757adbfe599de6bf702b Author: Jason Merrill <ja...@redhat.com> Date: Fri Jan 21 11:16:49 2022 -0500 c++: [[no_unique_address]] and virtual base [PR104139] Fixing a thinko in my patch for 103681: when computing the size of a virtual base, it would help to use its binfo instead of the one for the derived class. PR c++/104139 PR c++/103681 gcc/cp/ChangeLog: * class.cc (end_of_class): Use base_binfo. gcc/testsuite/ChangeLog: * g++.dg/abi/no_unique_address2.C: Adjust to detect this on x86-64.