[clang] Revert "[SSAF] Fix a stage2 test failure with ASan-instrumented clang - continued" (PR #218092)

[LLVM Continuous Integration via cfe-commits]

llvm-ci wrote:

LLVM Buildbot has detected a new failure on builder `lldb-aarch64-windows` running on `linaro-armv8-windows-msvc-05` while building `clang` at step 6 "test".

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

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

```
Step 6 (test) failure: build (failure)
...
PASS: lldb-unit :: SymbolFile/NativePDB/./SymbolFileNativePDBTests.exe/4/11 (2599 of 2674)
PASS: lldb-unit :: SymbolFile/NativePDB/./SymbolFileNativePDBTests.exe/5/11 (2600 of 2674)
PASS: lldb-unit :: SymbolFile/NativePDB/./SymbolFileNativePDBTests.exe/6/11 (2601 of 2674)
PASS: lldb-unit :: SymbolFile/NativePDB/./SymbolFileNativePDBTests.exe/7/11 (2602 of 2674)
PASS: lldb-unit :: SymbolFile/NativePDB/./SymbolFileNativePDBTests.exe/8/11 (2603 of 2674)
PASS: lldb-unit :: SymbolFile/NativePDB/./SymbolFileNativePDBTests.exe/9/11 (2604 of 2674)
PASS: lldb-unit :: Target/./TargetTests.exe/0/10 (2605 of 2674)
PASS: lldb-unit :: Target/./TargetTests.exe/1/10 (2606 of 2674)
PASS: lldb-unit :: Target/./TargetTests.exe/2/10 (2607 of 2674)
PASS: lldb-unit :: Target/./TargetTests.exe/3/10 (2608 of 2674)
FAIL: lldb-unit :: Target/./TargetTests.exe/4/10 (2609 of 2674)
******************** TEST 'lldb-unit :: Target/./TargetTests.exe/4/10' FAILED ********************
Script(shard):
--
GTEST_OUTPUT=json:C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\build\tools\lldb\unittests\Target\.\TargetTests.exe-lldb-unit-6772-4-10.json GTEST_SHUFFLE=0 GTEST_TOTAL_SHARDS=10 GTEST_SHARD_INDEX=4 C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\build\tools\lldb\unittests\Target\.\TargetTests.exe
--

Script:
--
C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\build\tools\lldb\unittests\Target\.\TargetTests.exe --gtest_filter=TestTypeSystemMap.GetScratchTypeSystemsIsOrderedByLanguage
--
C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\llvm-project\lldb\unittests\Target\ScratchTypeSystemTest.cpp(117): error: Expected: (g_fortran90_type_system.get()) < (g_fortran77_type_system.get()), actual: 0000023FB1187D30 vs 0000023FB1154B40


C:\Users\tcwg\llvm-worker\lldb-aarch64-windows\llvm-project\lldb\unittests\Target\ScratchTypeSystemTest.cpp:117
Expected: (g_fortran90_type_system.get()) < (g_fortran77_type_system.get()), actual: 0000023FB1187D30 vs 0000023FB1154B40



********************
PASS: lldb-unit :: Target/./TargetTests.exe/5/10 (2610 of 2674)
PASS: lldb-unit :: Target/./TargetTests.exe/6/10 (2611 of 2674)
PASS: lldb-unit :: Target/./TargetTests.exe/7/10 (2612 of 2674)
PASS: lldb-unit :: Target/./TargetTests.exe/8/10 (2613 of 2674)
PASS: lldb-unit :: Target/./TargetTests.exe/9/10 (2614 of 2674)
PASS: lldb-unit :: Thread/./ThreadTests.exe/0/4 (2615 of 2674)
PASS: lldb-unit :: Thread/./ThreadTests.exe/1/4 (2616 of 2674)
PASS: lldb-unit :: Thread/./ThreadTests.exe/2/4 (2617 of 2674)
PASS: lldb-unit :: Thread/./ThreadTests.exe/3/4 (2618 of 2674)
PASS: lldb-unit :: UnwindAssembly/ARM64/./Arm64InstEmulationTests.exe/0/9 (2619 of 2674)
PASS: lldb-unit :: UnwindAssembly/ARM64/./Arm64InstEmulationTests.exe/1/9 (2620 of 2674)
PASS: lldb-unit :: UnwindAssembly/ARM64/./Arm64InstEmulationTests.exe/2/9 (2621 of 2674)
PASS: lldb-unit :: UnwindAssembly/ARM64/./Arm64InstEmulationTests.exe/3/9 (2622 of 2674)
PASS: lldb-unit :: UnwindAssembly/ARM64/./Arm64InstEmulationTests.exe/4/9 (2623 of 2674)
PASS: lldb-unit :: UnwindAssembly/ARM64/./Arm64InstEmulationTests.exe/5/9 (2624 of 2674)
PASS: lldb-unit :: UnwindAssembly/ARM64/./Arm64InstEmulationTests.exe/6/9 (2625 of 2674)
PASS: lldb-unit :: UnwindAssembly/ARM64/./Arm64InstEmulationTests.exe/7/9 (2626 of 2674)
PASS: lldb-unit :: UnwindAssembly/ARM64/./Arm64InstEmulationTests.exe/8/9 (2627 of 2674)
PASS: lldb-unit :: UnwindAssembly/PPC64/./PPC64InstEmulationTests.exe/0/2 (2628 of 2674)

```

</details>

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