https://github.com/jinisusan approved this pull request. Works for me too, and LGTM, but yes, this would be an interim solution till we can get the FIR to change to embed some information regarding the 'use' statements. https://github.com/llvm/llvm-project/pull/107626