am a757c8ed: Merge "Fix tests now that dead phis are removed when building SSA."

* commit 'a757c8ed7f5ed67d44e2e7e0f5e425d8cb96d20a':
  Fix tests now that dead phis are removed when building SSA.