[llvm] [LAA] Fix non-NFC parts of 1aded51 (PR #160701)

[Ramkumar Ramachandra via llvm-commits]

artagnon wrote:

> @artagnon -- Is it alright to land a revert to unblock our builders with weekend approaching?

Of course, see https://github.com/llvm/llvm-project/pull/160993.

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