[6.2][cherrypick] Backport upstream cherrypicks for OpenBSD from stable.#10885

3405691582 wants to merge 2 commits intoswiftlang:swift/release/6.2swiftlang/llvm-project:swift/release/6.2from

3405691582:openbsd_623405691582/llvm-project:openbsd_62Copy head branch name to clipboard