[flang] Merge pull request flang-compiler/f18#1013 from flang-compiler/tsk-rewrite
drwxr-xr-x - flang