Thread safety analysis: fixes a bug in which locksets are not handled

properly if there is a join point in the control flow graph that involves
a trylock.  Also changes the source locations of some warnings to be
more consistent.

llvm-svn: 159008