Refactor AddCallGuards in two loops.#147477

bors merged 1 commit intorust-lang:masterrust-lang/rust:masterfrom

cjgillot:split-call-guardscjgillot/rust:split-call-guardsCopy head branch name to clipboard