Merge "Associate slow paths with the instruction that they belong to."
am: 21ce0dae31

* commit '21ce0dae31a72cee459dba352b4aa1ccb5157a5d':
  Associate slow paths with the instruction that they belong to.