update

Author: DataCorrupted

clang/lib/CodeGen/CGObjC.cpp

@@ -781,19 +781,15 @@ void CodeGenFunction::StartObjCMethod(const ObjCMethodDecl *OMD,
                 OMD->getLocation(), StartLoc);
 
   if (OMD->isDirectMethod()) {
-    if (CGM.getLangOpts().ObjCRuntime.isNeXTFamily()) {
-      // Having `InnerFn` indicates that we are generating a nil check thunk.
-      // In that case our job is done here.
-      if (InnerFn)
-        return;
-      if (CGM.shouldHaveNilCheckThunk(OMD))
-        // Go generate  a nil check thunk around `Fn`
-        CodeGenFunction(CGM, /*InnerFn=*/Fn).GenerateObjCDirectThunk(OMD, CD);
-      CGM.getObjCRuntime().GenerateDirectMethodPrologue(*this, Fn, OMD, CD);
-    } else {
-      // For GNU family, since GNU Step2 also supports direct methods now.
-      CGM.getObjCRuntime().GenerateDirectMethodPrologue(*this, Fn, OMD, CD);
-    }
+    // Having `InnerFn` indicates that we are generating a nil check thunk.
+    // In that case our job is done here.
+    if (InnerFn)
+      return;
+    // Only NeXTFamily can have nil check thunk.
+    if (CGM.shouldHaveNilCheckThunk(OMD))
+      // Go generate  a nil check thunk around `Fn`
+      CodeGenFunction(CGM, /*InnerFn=*/Fn).GenerateObjCDirectThunk(OMD, CD);
+    CGM.getObjCRuntime().GenerateDirectMethodPrologue(*this, Fn, OMD, CD);
   }
 
   // In ARC, certain methods get an extra cleanup.

clang/lib/CodeGen/CGObjCMac.cpp

@@ -3946,9 +3946,8 @@ void CGObjCCommonMac::GenerateDirectMethodPrologue(
   bool ReceiverCanBeNull = true;
   auto selfAddr = CGF.GetAddrOfLocalVar(OMD->getSelfDecl());
   auto selfValue = Builder.CreateLoad(selfAddr);
-  bool shouldHaveNilCheckThunk =
-      CGF.CGM.shouldHaveNilCheckThunk(OMD) bool isNilCheckThunk =
-          shouldHaveNilCheckThunk && CGF.InnerFn;
+  bool shouldHaveNilCheckThunk = CGF.CGM.shouldHaveNilCheckThunk(OMD);
+  bool isNilCheckThunk = shouldHaveNilCheckThunk && CGF.InnerFn;
 
   // Generate:
   //
@@ -3992,8 +3991,7 @@ void CGObjCCommonMac::GenerateDirectMethodPrologue(
 
   // Only emit nil check if this is a nil check thunk or the method
   // decides that its receiver can be null
-  if (isNilCheckThunk ||
-      (!CGF.CGM.shouldHaveNilCheckThunk(OMD) && ReceiverCanBeNull)) {
+  if (isNilCheckThunk || (!shouldHaveNilCheckThunk && ReceiverCanBeNull)) {
     llvm::BasicBlock *SelfIsNilBlock =
         CGF.createBasicBlock("objc_direct_method.self_is_nil");
     llvm::BasicBlock *ContBlock =