Partially Revert r272613. FreeBSD needs the non-trivial constructors in pair.

llvm-svn: 272671
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 3d30c32f02642213e322323184369b156e9cba5c
2 files changed