am cdb85087: am 2b25ba3c: Merge "[optimzing] Fix codegen bug and improve type propagation"

* commit 'cdb85087b290c76b46c721cfb7d0f2a631110f7a':
  [optimzing] Fix codegen bug and improve type propagation