ojhunt wrote: Two of the fixes were to code that was removed while resolving the merge conflict on the LANG_OPT declaration, I thought with the revert of c2a62af I got all the changes but I'll recheck https://github.com/llvm/llvm-project/pull/137661