We've got the type right, which has broken these tests - but now we need to get the location information correct that the type was papering over

llvm-svn: 183576

llvm-svn: 125144