Handle the const struct *
and struct *
patterns
#2304
Merged
const struct *
and struct *
patterns
#2304