fix the macos tests

Author: hyp

lib/PrintAsClang/PrintClangFunction.cpp

@@ -39,16 +39,24 @@ getKnownTypeInfo(const TypeDecl *typeDecl, PrimitiveTypeMapping &typeMapping,
              : typeMapping.getKnownCTypeInfo(typeDecl);
 }
 
-bool isKnownCxxType(Type t, PrimitiveTypeMapping &typeMapping) {
+bool isKnownType(Type t, PrimitiveTypeMapping &typeMapping,
+                 OutputLanguageMode languageMode) {
   const TypeDecl *typeDecl;
   if (auto *typeAliasType = dyn_cast<TypeAliasType>(t.getPointer()))
     typeDecl = typeAliasType->getDecl();
   else if (auto *structDecl = t->getStructOrBoundGenericStruct())
     typeDecl = structDecl;
   else
     return false;
-  return getKnownTypeInfo(typeDecl, typeMapping, OutputLanguageMode::Cxx) !=
-         None;
+  return getKnownTypeInfo(typeDecl, typeMapping, languageMode) != None;
+}
+
+bool isKnownCxxType(Type t, PrimitiveTypeMapping &typeMapping) {
+  return isKnownType(t, typeMapping, OutputLanguageMode::Cxx);
+}
+
+bool isKnownCType(Type t, PrimitiveTypeMapping &typeMapping) {
+  return isKnownType(t, typeMapping, OutputLanguageMode::ObjC);
 }
 
 // Prints types in the C function signature that corresponds to the
@@ -164,6 +172,7 @@ void DeclAndTypeClangFunctionPrinter::printFunctionSignature(
   // Print out the return type.
   bool isIndirectReturnType =
       kind == FunctionSignatureKind::CFunctionProto &&
+      !isKnownCType(resultTy, typeMapping) &&
       interopContext.getIrABIDetails().shouldReturnIndirectly(resultTy);
   if (!isIndirectReturnType) {
     OptionalTypeKind retKind;

test/Interop/SwiftToC/structs/small-structs-pass-return-direct-in-c.swift

@@ -136,13 +136,13 @@ public func printStructI8AndU32AndI16(_ x: StructI8AndU32AndI16) {
 
 // CHECK:      static inline void swift_interop_returnDirect_Structs_StructU16AndPointer(char * _Nonnull result, struct swift_interop_stub_Structs_StructU16AndPointer value) __attribute__((always_inline)) {
 // CHECK-NEXT:  memcpy(result + 0, &value._1, 1);
-// CHECK-NEXT:  memcpy(result + 8, &value._2, 8);
+// CHECK-NEXT:  memcpy(result + [[PTRSIZE:[48]]], &value._2, [[PTRSIZE]]);
 // CHECK-NEXT: }
 
 // CHECK:      static inline struct swift_interop_stub_Structs_StructU16AndPointer swift_interop_passDirect_Structs_StructU16AndPointer(const char * _Nonnull value) __attribute__((always_inline)) {
 // CHECK-NEXT:  struct swift_interop_stub_Structs_StructU16AndPointer result;
 // CHECK-NEXT:  memcpy(&result._1, value + 0, 1);
-// CHECK-NEXT:  memcpy(&result._2, value + 8, 8);
+// CHECK-NEXT:  memcpy(&result._2, value + [[PTRSIZE]], [[PTRSIZE]]);
 // CHECK-NEXT:  return result;
 // CHECK-NEXT: }