[llvm] Fix for revert of dea5aa73f (PR #134153)

[Matt Arsenault via llvm-commits]

https://github.com/arsenm requested changes to this pull request.

Dropped new tests.

Also needs new test that shows the waterfall regression.

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