https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79886
--- Comment #5 from Manuel López-Ibáñez <lopezibanez at gmail dot com> --- The first one seems the right approach. It will also fix a number of similar bugs in one go.The second one seems more fragile and it doesn't help in decoupling ME from FE more than the first.