More conservative fix for <rdar://problem/12847524> (a crash printing diagnostic ranges).

I'm not really happy with this fix, but I'm confident it's correct.

llvm-svn: 170397