[LLVM-2121]
1 regression 3 fixes
Details: https://ci.linaro.org/job/tcwg_flang_test--main-aarch64-Ofast-sve_vls-lto-lld-build/2590/artifact/artifacts/notify/mail-body.txt/*view*/