Merge r68d5235cb58f988c71b403334cd9482d663841ab into the 12.0 branch

[tstellar]

Bugzilla Link	50554
Resolution	FIXED
Resolved on	Jun 22, 2021 11:55
Version	12.0
OS	All
Blocks	#48661
Fixed by commit(s)	68d5235 884040d

Extended Description

Is it OK to merge the following revision(s) to the 12.0 branch?

[tstellar]

assigned to @eugenis

[tstellar]

https://reviews.llvm.org/rL68d5235cb58f988c71b403334cd9482d663841ab

[tstellar]

Hi Evgenii,

What is your opinion on backporting this?

https://reviews.llvm.org/rG68d5235cb58f988c71b403334cd9482d663841ab

[eugenis]

Hi Tom,

This is fine to merge to 12.0.

[tstellar]

Merged: 884040d