am ba471fa3: am aa874e0b: Merge "Quick: Rewrite Phi node insertion."

* commit 'ba471fa3210de40f6108e7a67c41c32fa2b39b98':
  Quick: Rewrite Phi node insertion.