Ok, I think I've got a solution I'm somewhat happy with - this now implements one of the ideas I had in the very beginning - we only insert branches for temp dtors when they are needed, thus giving the simple analyses better information to rely on. Please take another look... http://reviews.llvm.org/D3627