am 0c5e8417: Merge "Quick compiler: fix compile-time perf regression"

* commit '0c5e8417a1e82f6e31fbfc33be7e64d9073d6ef4':
  Quick compiler: fix compile-time perf regression