Merge f51ab187+7907c46f into 12.x

[hvdijk]

Bugzilla Link	50543
Resolution	FIXED
Resolved on	Jun 14, 2021 16:23
Version	unspecified
OS	Linux
Blocks	#48661
CC	@tstellar
Fixed by commit(s)	f51ab18 7907c46 3be5dbb adae177

Extended Description

Can f51ab18+7907c46f please be merged into 12.x to get into the 12.0.1 release?

https://reviews.llvm.org/D96787
https://reviews.llvm.org/D101851

These fixes the build when clang-tools-extra is checked out to clang/tools/extra, which is something that realistically only shows up with releases, not Git checkouts, and broke my 12.0.0 build.

[hvdijk]

assigned to @sam-mccall

[tstellar]

Hi Sam,

What is your opinion on backporting this?

https://reviews.llvm.org/rGf51ab1871655a9a96134c2636c37dcb5a6b01ac3
https://reviews.llvm.org/rG7907c46fe6195728fafd843b8c0fb19a3e68e9ad

[sam-mccall]

These look good to merge, thank you!

[tstellar]

The fix does not apply cleanly, could someone backport this and push a branch to their local github fork?

[tstellar]

Merged: adae177