Merge pull request #1582 from gmnicke2/issue-1580

Make TypeKind::BlockPointer's canonical type in IR be itself