Merging r167766: into the 3.2 release branch.

Fix more try scoping bugs introduced by r167650.

Introduces more clear scoping flags & flag combinations which should hopefully
be more understandable.

llvm-svn: 169451