Remove np suffix from objc_msgSend_stret2_np

Author: hmelder

clang/lib/CodeGen/CGObjCGNU.cpp

@@ -2905,13 +2905,11 @@ CGObjCGNU::GenerateMessageSend(CodeGenFunction &CGF,
       break;
     case CodeGenOptions::Mixed:
     case CodeGenOptions::NonLegacy:
+      StringRef name = "objc_msgSend";
       if (CGM.ReturnTypeUsesFPRet(ResultType)) {
-        imp =
-            CGM.CreateRuntimeFunction(llvm::FunctionType::get(IdTy, IdTy, true),
-                                      "objc_msgSend_fpret")
-                .getCallee();
+        name = "objc_msgSend_fpret";
       } else if (CGM.ReturnTypeUsesSRet(MSI.CallInfo)) {
-        StringRef name = "objc_msgSend_stret";
+        name = "objc_msgSend_stret";
 
         // The address of the memory block is be passed in x8 for POD type,
         // or in x0 for non-POD type (marked as inreg).
@@ -2922,19 +2920,14 @@ CGObjCGNU::GenerateMessageSend(CodeGenFunction &CGF,
                 .isWindowsMSVCEnvironment() &&
             CGM.getContext().getTargetInfo().getTriple().isAArch64();
         if (shouldCheckForInReg && CGM.ReturnTypeHasInReg(MSI.CallInfo)) {
-          name = "objc_msgSend_stret2_np";
+          name = "objc_msgSend_stret2";
         }
-
-        // The actual types here don't matter - we're going to bitcast the
-        // function anyway
-        imp = CGM.CreateRuntimeFunction(
-                     llvm::FunctionType::get(IdTy, IdTy, true), name)
-                  .getCallee();
-      } else {
-        imp = CGM.CreateRuntimeFunction(
-                     llvm::FunctionType::get(IdTy, IdTy, true), "objc_msgSend")
-                  .getCallee();
       }
+      // The actual types here don't matter - we're going to bitcast the
+      // function anyway
+      imp = CGM.CreateRuntimeFunction(
+                   llvm::FunctionType::get(IdTy, IdTy, true), name)
+                .getCallee();
     }
 
   // Reset the receiver in case the lookup modified it

clang/test/CodeGenObjCXX/msabi-stret-arm64.mm

@@ -70,8 +70,8 @@ void test0(MsgTest *t) {
     F1 ret2 = [t smallF1];
     // CHECK: call {{.*}} @objc_msgSend_stret
     S2 ret3 = [t stretS2];
-    // CHECK: call {{.*}} @objc_msgSend_stret2_np
+    // CHECK: call {{.*}} @objc_msgSend_stret2
     S3 ret4 = [t stretInRegS3];
-    // CHECK: call {{.*}} @objc_msgSend_stret2_np
+    // CHECK: call {{.*}} @objc_msgSend_stret2
     S3 ret5 = [MsgTest msgTestStretInRegS3];
 }