Backport D130817 and D131828 to LLVM15

[phoebewang]

/cherry-pick 8b69549

[llvmbot]

@llvm/issue-subscribers-backend-x86

[llvmbot]

Failed to cherry-pick: 8b69549

https://github.com/llvm/llvm-project/actions/runs/2854083030

Please manually backport the fix and push it to your github fork. Once this is done, please add a comment like this:

/branch <user>/<repo>/<branch>

[phoebewang]

/cherry-pick 23021d4 8b69549

[llvmbot]

/branch llvm/llvm-project-release-prs/issue57141

[llvmbot]

/pull-request llvm/llvm-project-release-prs#105