[clang] Reapply "[NFC][CFI] Avoid clang error in CFI tests" (#136030) (PR #136177)

[LLVM Continuous Integration via cfe-commits]

llvm-ci wrote:

LLVM Buildbot has detected a new failure on builder `llvm-clang-x86_64-gcc-ubuntu` running on `sie-linux-worker3` while building `clang` at step 6 "test-build-unified-tree-check-all".

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

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

```
Step 6 (test-build-unified-tree-check-all) failure: 1200 seconds without output running [b'ninja', b'check-all'], attempting to kill
...
PASS: lit :: shtest-not.py (90249 of 90259)
PASS: lit :: allow-retries.py (90250 of 90259)
PASS: lit :: discovery.py (90251 of 90259)
PASS: lit :: shtest-external-shell-kill.py (90252 of 90259)
PASS: lit :: googletest-timeout.py (90253 of 90259)
PASS: lit :: selecting.py (90254 of 90259)
PASS: lit :: shtest-timeout.py (90255 of 90259)
PASS: lit :: max-time.py (90256 of 90259)
PASS: lit :: shtest-shell.py (90257 of 90259)
PASS: lit :: shtest-define.py (90258 of 90259)
command timed out: 1200 seconds without output running [b'ninja', b'check-all'], attempting to kill
process killed by signal 9
program finished with exit code -1
elapsedTime=1841.923962

```

</details>

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