https://github.com/preames approved this pull request. LGTM - Seems like a reasonable workaround for a real issue and a few days have gone by with no other suggestions made. https://github.com/llvm/llvm-project/pull/114012