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

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