Small bug fix, shouldn't mark class method as nonnull

Author: DataCorrupted

clang/lib/CodeGen/CGCall.cpp

@@ -2745,10 +2745,9 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
   // Direct method prologue should not contain nil check anymore.
   // As a result, we can set `self` to be NonNull to prepare for further
   // optimizations.
-  if (getLangOpts().ObjCEmitNilCheckThunk && TargetDecl) {
+  if (TargetDecl) {
     auto OMD = dyn_cast<ObjCMethodDecl>(TargetDecl);
-    bool isDirect = OMD && OMD->isDirectMethod();
-    if (isDirect && !IsThunk) {
+    if (shouldHaveNilCheckThunk(OMD) && !IsThunk) {
       auto IRArgs = IRFunctionArgs.getIRArgs(0);
       ArgAttrs[IRArgs.first] = ArgAttrs[IRArgs.first].addAttribute(
           getLLVMContext(), llvm::Attribute::NonNull);

clang/test/CodeGenObjC/direct-method-nil-check-thunk.m

@@ -67,7 +67,7 @@ - (int)getInt __attribute__((objc_direct)) {
 
 // CHECK-NOT: @"\01+[Root classGetInt]_inner"
 + (int)classGetInt __attribute__((objc_direct)) {
-  // CHECK: define hidden i32 @"\01+[Root classGetInt]"(ptr noundef nonnull [[ARGSELF:%.*]])
+  // CHECK: define hidden i32 @"\01+[Root classGetInt]"(ptr noundef [[ARGSELF:%.*]])
   // [self self]
   // CHECK-LABEL: entry:
   // CHECK-NEXT: [[SELFADDR:%.*]] = alloca ptr,
@@ -165,7 +165,7 @@ - (struct my_aggregate_struct)getAggregate __attribute__((objc_direct)) {
   return st;
 }
 
-// CHECK-LABEL: define hidden void @"\01+[Root classGetAggregate]"({{.*}}, ptr noundef nonnull {{.*}})
+// CHECK-LABEL: define hidden void @"\01+[Root classGetAggregate]"({{.*}}, ptr noundef {{.*}})
 // CHECK-NOT: @"\01+[Root classGetAggregate]_inner"
 + (struct my_aggregate_struct)classGetAggregate __attribute__((objc_direct)) {
   struct my_aggregate_struct st = {.a = 42};