Merge "Accept synthetic phi nodes and general names for blocks."
am: 584bc17049

* commit '584bc170492216c6e3117eb895a6a12bcc9dcf42':
  Accept synthetic phi nodes and general names for blocks.