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/Sema/SemaInit.cpp

diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index 0bf2578..f4687fe 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/lib/Sema/SemaInit.cpp
@@ -5381,7 +5381,7 @@
   Expr *Initializer = nullptr;
   if (Args.size() == 1) {
     Initializer = Args[0];
-    if (S.getLangOpts().ObjC1) {
+    if (S.getLangOpts().ObjC) {
       if (S.CheckObjCBridgeRelatedConversions(Initializer->getBeginLoc(),
                                               DestType, Initializer->getType(),
                                               Initializer) ||