[LLVM-2167]
2 regressions 7 fixes
Details: https://ci.linaro.org/job/tcwg_flang_test--main-aarch64-Ofast-sve_vla-build/3033/artifact/artifacts/notify/mail-body.txt/*view*/