Merge changes I2e3eb0b3,I2f7bd13e
am: cb698c387c

* commit 'cb698c387cbb2ea0265bdbd85b89dd25d55afb42':
  Delete FixupDiagMsg and cite the commit that makes it unnecessary.
  Add a test for a port comparison bytecode validation bug.