Merge changes I2e3eb0b3,I2f7bd13e

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