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.



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