address review comments

Author: hnrklssn

lib/ClangImporter/ImportDecl.cpp

@@ -9145,7 +9145,8 @@ struct CountedByExpressionValidator
 };
 } // namespace
 
-// don't try to transform any Swift types that _SwiftifyImport doesn't know how to handle
+// Don't try to transform any Swift types that _SwiftifyImport doesn't know how
+// to handle.
 static bool SwiftifiableCountedByPointerType(Type swiftType) {
   Type nonnullType = swiftType->lookThroughSingleOptionalType();
   PointerTypeKind PTK;

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

@@ -2,7 +2,9 @@
 
 #include <stdint.h>
 
+#ifndef __sized_by
 #define __sized_by(x) __attribute__((__sized_by__(x)))
+#endif
 
 void simple(int len, void * __sized_by(len) p);
 
@@ -24,8 +26,14 @@ void * __sized_by(len) returnPointer(int len);
 typedef struct foo opaque_t;
 void opaque(int len, opaque_t * __sized_by(len) p);
 
+typedef opaque_t *opaqueptr_t;
+void opaqueptr(int len, opaqueptr_t __sized_by(len) p);
+
 void charsized(char *__sized_by(size), int size);
 
 uint8_t *__sized_by(size) bytesized(int size);
 
-void doublebytesized(uint16_t *__sized_by(size), int size);
+void doublebytesized(uint16_t *__sized_by(size), int size);
+
+typedef uint8_t * bytesizedptr_t;
+void aliasedBytesized(bytesizedptr_t __sized_by(size) p, int size);

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

@@ -10,6 +10,9 @@ import SizedByClang
 
 
 // CHECK:      /// This is an auto-generated wrapper for safer interop
+// CHECK-NEXT: @_alwaysEmitIntoClient @_disfavoredOverload public func aliasedBytesized(_  p: UnsafeMutableRawBufferPointer)
+
+// CHECK-NEXT: /// This is an auto-generated wrapper for safer interop
 // CHECK-NEXT: @_alwaysEmitIntoClient @_disfavoredOverload public func bytesized(_  size: Int{{.*}}) -> UnsafeMutableRawBufferPointer
 
 // CHECK-NEXT: /// This is an auto-generated wrapper for safer interop
@@ -30,6 +33,9 @@ import SizedByClang
 // CHECK-NEXT: /// This is an auto-generated wrapper for safer interop
 // CHECK-NEXT: @_alwaysEmitIntoClient @_disfavoredOverload public func opaque(_  p: UnsafeRawBufferPointer)
 
+// CHECK-NEXT: /// This is an auto-generated wrapper for safer interop
+// CHECK-NEXT: @_alwaysEmitIntoClient @_disfavoredOverload public func opaqueptr(_  p: UnsafeRawBufferPointer)
+
 // CHECK-NEXT: /// This is an auto-generated wrapper for safer interop
 // CHECK-NEXT: @_alwaysEmitIntoClient @_disfavoredOverload public func returnPointer(_ len: Int{{.*}}) -> UnsafeMutableRawBufferPointer
 
@@ -67,6 +73,11 @@ public func callOpaque(_ p: UnsafeRawBufferPointer) {
   unsafe opaque(p)
 }
 
+@inlinable
+public func callOpaqueptr(_ p: UnsafeRawBufferPointer) {
+  unsafe opaqueptr(p)
+}
+
 @inlinable
 public func callReturnPointer() {
   let _: UnsafeMutableRawBufferPointer? = returnPointer(4) // call wrapper
@@ -97,3 +108,8 @@ public func callCharsized(_ p: UnsafeMutableRawBufferPointer) {
 public func callBytesized() {
   let _: UnsafeMutableRawBufferPointer = bytesized(37)
 }
+
+@inlinable
+public func callAliasedBytesized(_ p: UnsafeMutableRawBufferPointer) {
+  unsafe aliasedBytesized(p)
+}