Some refactoring and using more modern APIs for

implementation of co/contra-variance objc++
block pointers. // rdar://8979379.


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