Fix an assertion when handling a custom case of virtual inheritance; also reduce code duplication

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193610 91177308-0d34-0410-b5e6-96231b3b80d8