Please backport 092c303955cd18be6c0b923b1c0a1b96e2c91893 to 12.0.1

[serge-sans-paille]

Bugzilla Link	50705
Resolution	FIXED
Resolved on	Jun 21, 2021 11:02
Version	unspecified
OS	Windows NT
Blocks	#48661
CC	@zygoloid,@tstellar
Fixed by commit(s)	092c303 a83ef21 9be9215 051126f

Extended Description

And eventually a83ef21 that fixes an associated warning

[serge-sans-paille]

assigned to @topperc

[tstellar]

Hi Craig,

What is your opinion on backporting this?

https://reviews.llvm.org/rG092c303955cd18be6c0b923b1c0a1b96e2c91893
https://reviews.llvm.org/rGa83ef21ff82e4283044fd31470fc6c1bc4b99c51

[topperc]

Seems fine to me.

[tstellar]

Merged: 051126f