[Swiftify][ClangImporter] Import noescape attribute for parameters

lib/ClangImporter/ImportDecl.cpp

@@ -8912,6 +8912,9 @@ void ClangImporter::Implementation::importBoundsAttributes(
     for (auto [index, param] : llvm::enumerate(ClangDecl->parameters())) {
       if (auto CAT = param->getType()->getAs<clang::CountAttributedType>()) {
         printer.printCountedBy(CAT, index);
+        if (param->hasAttr<clang::NoEscapeAttr>()) {
+          printer.printNonEscaping(index);
+        }
       }
     }
     if (auto CAT =

test/Interop/C/swiftify-import/Inputs/counted-by-noescape.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#define __counted_by(x) __attribute__((__counted_by__(x)))
+#define __noescape __attribute__((noescape))
+
+void simple(int len, int * __counted_by(len) __noescape p);
+
+void swiftAttr(int len, int *p) __attribute__((
+    swift_attr("@_SwiftifyImport(.countedBy(pointer: .param(2), count: \"len\"), .nonescaping(pointer: .param(2)))")));
+
+void shared(int len, int * __counted_by(len) __noescape p1, int * __counted_by(len) __noescape p2);
+
+void complexExpr(int len, int offset, int * __counted_by(len - offset) __noescape p);
+
+void nullUnspecified(int len, int * __counted_by(len) _Null_unspecified __noescape p);
+
+void nonnull(int len, int * __counted_by(len) _Nonnull __noescape p);
+
+//void nullable(int len, int * __counted_by(len) _Nullable p);
+
+int * __counted_by(len) __noescape returnPointer(int len);
+

test/Interop/C/swiftify-import/Inputs/module.modulemap

@@ -2,8 +2,16 @@ module CountedByClang {
     header "counted-by.h"
     export *
 }
+module CountedByNoEscapeClang {
+    header "counted-by-noescape.h"
+    export *
+}
 module SizedByClang {
     header "sized-by.h"
     export *
 }
+module SizedByNoEscapeClang {
+    header "sized-by-noescape.h"
+    export *
+}
 

test/Interop/C/swiftify-import/Inputs/sized-by-noescape.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#define __sized_by(x) __attribute__((__sized_by__(x)))
+#define __noescape __attribute__((noescape))
+
+void simple(int len, const void * __sized_by(len) __noescape p);
+
+void swiftAttr(int len, const void *p) __attribute__((swift_attr(
+    "@_SwiftifyImport(.sizedBy(pointer: .param(2), size: \"len\"), .nonescaping(pointer: .param(2)))")));
+
+void shared(int len, const void * __sized_by(len) __noescape p1, const void * __sized_by(len) __noescape p2);
+
+void complexExpr(int len, int offset, const void * __sized_by(len - offset) __noescape p);
+
+void nullUnspecified(int len, const void * __sized_by(len) __noescape _Null_unspecified p);
+
+void nonnull(int len, const void * __sized_by(len) __noescape _Nonnull p);
+
+// Nullable ~Escapable types not supported yet
+//void nullable(int len, const void * __sized_by(len) __noescape _Nullable p);
+
+const void * __sized_by(len) __noescape _Nonnull returnPointer(int len);
+
+typedef struct foo opaque_t;
+void opaque(int len, opaque_t * __sized_by(len) __noescape p);
+

test/Interop/C/swiftify-import/Inputs/sized-by.h

@@ -17,5 +17,7 @@ void nonnull(int len, void * __sized_by(len) _Nonnull p);
 
 void nullable(int len, void * __sized_by(len) _Nullable p);
 
+void * __sized_by(len) returnPointer(int len);
+
 typedef struct foo opaque_t;
 void opaque(int len, opaque_t * __sized_by(len) p);

test/Interop/C/swiftify-import/counted-by-noescape.swift

@@ -0,0 +1,27 @@
+// REQUIRES: swift_feature_SafeInteropWrappers
+// REQUIRES: swift_feature_Span
+
+// RUN: %target-swift-ide-test -print-module -module-to-print=CountedByNoEscapeClang -plugin-path %swift-plugin-dir -I %S/Inputs -source-filename=x -enable-experimental-feature SafeInteropWrappers -enable-experimental-feature Span | %FileCheck %s
+
+// swift-ide-test doesn't currently typecheck the macro expansions, so run the compiler as well
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/CountedByNoEscape.swiftmodule -I %S/Inputs -enable-experimental-feature SafeInteropWrappers %s
+
+// Check that ClangImporter correctly infers and expands @_SwiftifyImport macros for functions with __counted_by __noescape parameters.
+
+import CountedByNoEscapeClang
+
+// CHECK:      @_alwaysEmitIntoClient public func complexExpr(_ len: Int{{.*}}, _ offset: Int{{.*}}, _ p: MutableSpan<Int{{.*}}>)
+// CHECK-NEXT: @_alwaysEmitIntoClient public func nonnull(_  p: MutableSpan<Int{{.*}}>)
+// CHECK-NEXT: @_alwaysEmitIntoClient public func nullUnspecified(_  p: MutableSpan<Int{{.*}}>)
+// CHECK-NEXT: @_alwaysEmitIntoClient public func returnPointer(_  len: Int{{.*}}) -> UnsafeMutableBufferPointer<Int{{.*}}>
+// CHECK-NEXT: @_alwaysEmitIntoClient public func shared(_ len: Int{{.*}}, _ p1: MutableSpan<Int{{.*}}>, _ p2: MutableSpan<Int{{.*}}>)
+// CHECK-NEXT: @_alwaysEmitIntoClient public func simple(_  p: MutableSpan<Int{{.*}}>)
+// CHECK-NEXT: @_alwaysEmitIntoClient public func swiftAttr(_  p: MutableSpan<Int{{.*}}>)
+
+@inlinable
+public func callReturnPointer() {
+  let a: UnsafeMutableBufferPointer<CInt>? = returnPointer(4) // call wrapper
+  let b: UnsafeMutablePointer<CInt>? = returnPointer(4) // call unsafe interop
+}
+

test/Interop/C/swiftify-import/sized-by-noescape.swift

@@ -0,0 +1,20 @@
+// REQUIRES: swift_feature_SafeInteropWrappers
+// REQUIRES: swift_feature_Span
+
+// RUN: %target-swift-ide-test -print-module -module-to-print=SizedByNoEscapeClang -plugin-path %swift-plugin-dir -I %S/Inputs -source-filename=x -enable-experimental-feature SafeInteropWrappers -enable-experimental-feature Span | %FileCheck %s
+
+// swift-ide-test doesn't currently typecheck the macro expansions, so run the compiler as well
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/SizedByNoEscape.swiftmodule -I %S/Inputs -enable-experimental-feature SafeInteropWrappers %s
+
+// Check that ClangImporter correctly infers and expands @_SwiftifyImport macros for functions with __sized_by __noescape parameters.
+import SizedByNoEscapeClang
+
+// CHECK:      @_alwaysEmitIntoClient public func complexExpr(_ len: Int{{.*}}, _ offset: Int{{.*}}, _ p: RawSpan)
+// CHECK-NEXT: @_alwaysEmitIntoClient public func nonnull(_ p: RawSpan)
+// CHECK-NEXT: @_alwaysEmitIntoClient public func nullUnspecified(_  p: RawSpan)
+// CHECK-NEXT: @_alwaysEmitIntoClient public func opaque(_  p: RawSpan)
+// CHECK-NEXT: @_alwaysEmitIntoClient public func returnPointer(_ len: Int{{.*}}) -> UnsafeRawBufferPointer
+// CHECK-NEXT: @_alwaysEmitIntoClient public func shared(_ len: Int{{.*}}, _ p1: RawSpan, _ p2: RawSpan)
+// CHECK-NEXT: @_alwaysEmitIntoClient public func simple(_  p: RawSpan)
+// CHECK-NEXT: @_alwaysEmitIntoClient public func swiftAttr(_  p: RawSpan)

test/Interop/C/swiftify-import/sized-by.swift

@@ -4,7 +4,7 @@
 
 // swift-ide-test doesn't currently typecheck the macro expansions, so run the compiler as well
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/CountedBy.swiftmodule -I %S/Inputs -enable-experimental-feature SafeInteropWrappers %s
+// RUN: %target-swift-frontend -emit-module -plugin-path %swift-plugin-dir -o %t/SizedBy.swiftmodule -I %S/Inputs -enable-experimental-feature SafeInteropWrappers %s
 
 // Check that ClangImporter correctly infers and expands @_SwiftifyImport macros for functions with __sized_by parameters.
 import SizedByClang
@@ -14,6 +14,7 @@ import SizedByClang
 // CHECK-NEXT: @_alwaysEmitIntoClient public func nullUnspecified(_  p: UnsafeMutableRawBufferPointer)
 // CHECK-NEXT: @_alwaysEmitIntoClient public func nullable(_  p: UnsafeMutableRawBufferPointer?)
 // CHECK-NEXT: @_alwaysEmitIntoClient public func opaque(_  p: UnsafeRawBufferPointer)
+// CHECK-NEXT: @_alwaysEmitIntoClient public func returnPointer(_ len: Int{{.*}}) -> UnsafeMutableRawBufferPointer
 // CHECK-NEXT: @_alwaysEmitIntoClient public func shared(_ len: Int{{.*}}, _ p1: UnsafeMutableRawBufferPointer, _ p2: UnsafeMutableRawBufferPointer)
 // CHECK-NEXT: @_alwaysEmitIntoClient public func simple(_  p: UnsafeMutableRawBufferPointer)
 // CHECK-NEXT: @_alwaysEmitIntoClient public func swiftAttr(_  p: UnsafeMutableRawBufferPointer)