Fix PR18967 -- Bad this adjustment for virtual methods in a diamond virtual inheritance hierarchy