commit fa98390b3c3144c7cd446621526ca04c075435d8
author Erik Pilkington <erik.pilkington@gmail.com> Tue Oct 30 20:31:30 2018 +0000
committer Erik Pilkington <erik.pilkington@gmail.com> Tue Oct 30 20:31:30 2018 +0000
tree f9c611a2729575b3822b5c0721b4a56f673c4ec2
parent fe09a20f09a290274ea81d1703d4106e06a11f94

NFC: Remove the ObjC1/ObjC2 distinction from clang (and related projects)

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.

Differential revision: https://reviews.llvm.org/D53547

llvm-svn: 345637

clang/lib/Frontend/CompilerInstance.cpp

diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp
index bba1ef1..a8d80a0 100644
--- a/clang/lib/Frontend/CompilerInstance.cpp
+++ b/clang/lib/Frontend/CompilerInstance.cpp
@@ -1024,7 +1024,7 @@
     return InputKind::OpenCL;
   if (LangOpts.CUDA)
     return InputKind::CUDA;
-  if (LangOpts.ObjC1)
+  if (LangOpts.ObjC)
     return LangOpts.CPlusPlus ? InputKind::ObjCXX : InputKind::ObjC;
   return LangOpts.CPlusPlus ? InputKind::CXX : InputKind::C;
 }