[flang] Merge pull request flang-compiler/f18#593 from flang-compiler/jpr-fix-515

Fix issue flang-compiler/f18#515

Original-commit: flang-compiler/f18@415d6d611062b5bc8ccfd156557f70352bf00174
Reviewed-on: https://github.com/flang-compiler/f18/pull/593