dberlin added a comment. Sorry, most of the issues here are because arc picked up the rebase, and isn't showing the fix for 31761 as the base. (the fix is what contains the #if blocks, etc) https://reviews.llvm.org/D29149