854c854
< if (TREE_CODE (type) != RECORD_TYPE)
---
> if (!CLASS_TYPE_P (type))
899c899,901
< if (sufficient_parms_p (TREE_CHAIN (parms)))
---
> parms = skip_artificial_parms_for (fn, parms);
>
> if (sufficient_parms_p (parms))
943c945
< parms = TREE_CHAIN (parms);
---
> parms = skip_artificial_parms_for (fn, parms);