am f69f56e7: Merge "Generalize codegen and simplification of deopt."

* commit 'f69f56e7d4a1e31dfce2a77558c9b7047f82092b':
  Generalize codegen and simplification of deopt.