spatel added a comment. The code change seems safe, but the test doesn't fail with recent trunk (I tried r304685). Is there still a way to expose the bug? If not, can we just assert that no deleted node can get this far? https://reviews.llvm.org/D33731