[Hexagon] Tidy up some code, NFC: reapply r277372 with a fix


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@277383 91177308-0d34-0410-b5e6-96231b3b80d8
2 files changed