This is now fixed in clang so these workarounds are no longer needed.
Created attachment 450809 [details] patch
Committed r289128 (246825@main): <https://commits.webkit.org/246825@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450809 [details].
<rdar://problem/88497773>