https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89174
--- Comment #14 from Neil Carlson <neil.n.carlson at gmail dot com> --- The comment for r268313 calls out a change to gfc_find_and_cut_at_last_class_ref -- same function Thomas worked on for the fix on the trunk.