Merge "Remove unreachable code paths in constant folding."
am: d9ad7463ed

* commit 'd9ad7463eda39d9b8bee204f91a3b7b7fa6b0a1a':
  Remove unreachable code paths in constant folding.