[lld] Fix inconsistent style and do cleanup.

git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@182031 91177308-0d34-0410-b5e6-96231b3b80d8
[lld] Do not create a temporary pair.

git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@182033 91177308-0d34-0410-b5e6-96231b3b80d8