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

* commit '5128fc70ca7011f5a3727d61152d5dbb5cb16c67':
  Accept synthetic phi nodes and general names for blocks.