We haven't supported compiling ObjC1 for a long time (and never will again), so there isn't any reason to keep these separate. This patch replaces LangOpts::ObjC1 and LangOpts::ObjC2 with LangOpts::ObjC. See a recent thread on cfe-dev here: http://lists.llvm.org/pipermail/cfe-dev/2018-September/059468.html
Thanks for taking a look!
Erik
LLVM style wants to get rid of the braces here (and the next few instances of this). Since you're touching this code, would you mind fixing that as well?