"If it ain't broke don't fix it" - previous diff had trouble because I refactored the tests in addition to the API change. This time I tested locally with asan and assertions (good practice going forward anyway) but it would be nice if it were possible to run the bulidbots manually to verify*.
*You can in fact run them manually on commits/branches in llvm/llvm-project but not on google/llvm-premerge-checks.