am 13c4e8f4: Merge "Fix test now that instructions can die at instruction entry."

* commit '13c4e8f4ef687f650aa76fb15ab12762d5a85602':
  Fix test now that instructions can die at instruction entry.