steven_wu added a comment. I think this is probably the best fix I can think as well. Agree with Teresa says, please add comments for reasons why it is implemented this way. CHANGES SINCE LAST ACTION https://reviews.llvm.org/D70006/new/ https://reviews.llvm.org/D70006