Better capturing of invariants Reviewed By: aartbik Differential Revision: https://reviews.llvm.org/D116700