am 995e7d49: Merge "Fix inlining in the presence of multiple returns."

* commit '995e7d495eb898b2812e14ad82d54597676e93fd':
  Fix inlining in the presence of multiple returns.