[llvm] Revert #140650 and #140505 (PR #140973)

[LLVM Continuous Integration via llvm-commits]

llvm-ci wrote:

LLVM Buildbot has detected a new failure on builder `lld-x86_64-ubuntu-fast` running on `as-builder-4` while building `llvm` at step 6 "test-build-unified-tree-check-all".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/33/builds/16902

<details>
<summary>Here is the relevant piece of the build log for the reference</summary>

```
Step 6 (test-build-unified-tree-check-all) failure: test (failure)
******************** TEST 'lld :: COFF/lto-cache-errors.ll' FAILED ********************
Exit Code: 1

Command Output (stderr):
--
/home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/bin/opt -module-hash -module-summary /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/llvm-project/lld/test/COFF/lto-cache-errors.ll -o /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp.o # RUN: at line 5
+ /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/bin/opt -module-hash -module-summary /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/llvm-project/lld/test/COFF/lto-cache-errors.ll -o /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp.o
/home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/bin/opt -module-hash -module-summary /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/llvm-project/lld/test/COFF/Inputs/lto-cache.ll -o /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp2.o # RUN: at line 6
+ /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/bin/opt -module-hash -module-summary /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/llvm-project/lld/test/COFF/Inputs/lto-cache.ll -o /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp2.o
rm -Rf /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp.cache && mkdir /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp.cache # RUN: at line 7
+ rm -Rf /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp.cache
+ mkdir /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp.cache
chmod 444 /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp.cache # RUN: at line 8
+ chmod 444 /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp.cache
not /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/bin/lld-link /lldltocache:/home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp.cache/nonexistant/ /out:/home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp3 /entry:main /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp2.o /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp.o 2>&1 | /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/bin/FileCheck /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/llvm-project/lld/test/COFF/lto-cache-errors.ll # RUN: at line 11
+ not /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/bin/lld-link /lldltocache:/home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp.cache/nonexistant/ /out:/home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp3 /entry:main /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp2.o /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/tools/lld/test/COFF/Output/lto-cache-errors.ll.tmp.o
+ /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/build/bin/FileCheck /home/buildbot/worker/as-builder-4/ramdisk/lld-x86_64/llvm-project/lld/test/COFF/lto-cache-errors.ll

--

********************


```

</details>

https://github.com/llvm/llvm-project/pull/140973