[interop][SwiftToC] print out nullability specifiers for primitive C types

Author: hyp

lib/PrintAsClang/PrintClangFunction.cpp

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "PrintClangFunction.h"
+#include "ClangSyntaxPrinter.h"
 #include "DeclAndTypePrinter.h"
 #include "PrimitiveTypeMapping.h"
 #include "swift/AST/Decl.h"
@@ -26,21 +27,21 @@ using namespace swift;
 // native Swift function/method.
 class CFunctionSignatureTypePrinter
     : public TypeVisitor<CFunctionSignatureTypePrinter, void,
-                         Optional<OptionalTypeKind>> {
+                         Optional<OptionalTypeKind>>,
+      private ClangSyntaxPrinter {
 public:
   CFunctionSignatureTypePrinter(raw_ostream &os,
                                 PrimitiveTypeMapping &typeMapping)
-      : os(os), typeMapping(typeMapping) {}
+      : ClangSyntaxPrinter(os), typeMapping(typeMapping) {}
 
   bool printIfKnownSimpleType(const TypeDecl *typeDecl,
                               Optional<OptionalTypeKind> optionalKind) {
     auto knownTypeInfo = typeMapping.getKnownCTypeInfo(typeDecl);
     if (!knownTypeInfo)
       return false;
     os << knownTypeInfo->name;
-    // FIXME:
-    // if (knownTypeInfo->canBeNullable)
-    //   printNullability(optionalKind);
+    if (knownTypeInfo->canBeNullable)
+      printNullability(optionalKind);
     return true;
   }
 
@@ -81,7 +82,6 @@ class CFunctionSignatureTypePrinter
   }
 
 private:
-  raw_ostream &os;
   PrimitiveTypeMapping &typeMapping;
 };
 

test/Interop/SwiftToC/functions/swift-primitive-functions-c-bridging.swift

@@ -29,14 +29,19 @@
 // CHECK-NEXT: SWIFT_EXTERN int32_t $s9Functions16passThroughInt32ys0D0VADF(int32_t x) SWIFT_NOEXCEPT SWIFT_CALL;
 // CHECK-NEXT: SWIFT_EXTERN int64_t $s9Functions16passThroughInt64ys0D0VADF(int64_t x) SWIFT_NOEXCEPT SWIFT_CALL;
 // CHECK-NEXT: SWIFT_EXTERN int8_t $s9Functions15passThroughInt8ys0D0VADF(int8_t x) SWIFT_NOEXCEPT SWIFT_CALL;
-// CHECK-NEXT: SWIFT_EXTERN void * $s9Functions24passThroughOpaquePointerys0dE0VADF(void * x) SWIFT_NOEXCEPT SWIFT_CALL;
+// CHECK-NEXT: SWIFT_EXTERN void * _Nonnull $s9Functions24passThroughOpaquePointerys0dE0VADF(void * _Nonnull x) SWIFT_NOEXCEPT SWIFT_CALL;
 // CHECK-NEXT: SWIFT_EXTERN size_t $s9Functions15passThroughUIntyS2uF(size_t x) SWIFT_NOEXCEPT SWIFT_CALL;
 // CHECK-NEXT: SWIFT_EXTERN uint16_t $s9Functions17passThroughUInt16ys0D0VADF(uint16_t x) SWIFT_NOEXCEPT SWIFT_CALL;
 // CHECK-NEXT: SWIFT_EXTERN uint32_t $s9Functions17passThroughUInt32ys0D0VADF(uint32_t x) SWIFT_NOEXCEPT SWIFT_CALL;
 // CHECK-NEXT: SWIFT_EXTERN uint64_t $s9Functions17passThroughUInt64ys0D0VADF(uint64_t x) SWIFT_NOEXCEPT SWIFT_CALL;
 // CHECK-NEXT: SWIFT_EXTERN uint8_t $s9Functions16passThroughUInt8ys0D0VADF(uint8_t x) SWIFT_NOEXCEPT SWIFT_CALL;
-// CHECK-NEXT: SWIFT_EXTERN void * $s9Functions34passThroughUnsafeMutableRawPointeryS2vF(void * x) SWIFT_NOEXCEPT SWIFT_CALL;
-// CHECK-NEXT: SWIFT_EXTERN void const * $s9Functions27passThroughUnsafeRawPointeryS2VF(void const * x) SWIFT_NOEXCEPT SWIFT_CALL;
+// CHECK-NEXT: SWIFT_EXTERN void * _Nonnull $s9Functions34passThroughUnsafeMutableRawPointeryS2vF(void * _Nonnull x) SWIFT_NOEXCEPT SWIFT_CALL;
+// CHECK-NEXT: SWIFT_EXTERN void const * _Nonnull $s9Functions27passThroughUnsafeRawPointeryS2VF(void const * _Nonnull x) SWIFT_NOEXCEPT SWIFT_CALL;
+// CHECK-NEXT: SWIFT_EXTERN void * _Nullable $s9Functions42roundTwoPassThroughUnsafeMutableRawPointerySvSgACF(void * _Nullable x) SWIFT_NOEXCEPT SWIFT_CALL;
+// CHECK-EMPTY:
+// CHECK-NEXT: #ifdef __cplusplus
+// CHECK-NEXT: }
+// CHECK-NEXT: }
 
 public func passThroughCBool(_ x: CBool) -> CBool { return x }
 
@@ -82,3 +87,5 @@ public func passThroughBool(_ x: Bool) -> Bool { return x }
 public func passThroughOpaquePointer(_ x: OpaquePointer) -> OpaquePointer { return x }
 public func passThroughUnsafeRawPointer(_ x: UnsafeRawPointer) -> UnsafeRawPointer { return x }
 public func passThroughUnsafeMutableRawPointer(_ x: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { return x }
+
+public func roundTwoPassThroughUnsafeMutableRawPointer(_ x: UnsafeMutableRawPointer?) -> UnsafeMutableRawPointer? { return x }

test/lit.cfg

@@ -588,6 +588,8 @@ extraCheckWarningFlags = (
 # Verifies that a C++ file can be compiled without warnings except for some exceptions.
 config.substitutions.insert(0, ('%check-c-header-in-clang',
   '%clang -fsyntax-only -x c-header ' + extraCheckWarningFlags +
+  # Don't warn about nullability specifiers in C code.
+  '-Wno-nullability-extension '
   # Use standard header/framework search paths.
   '-F %%clang-importer-sdk-path/frameworks '
   '-I %%clang-include-dir '