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

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