Rename _PointerParam to _SwiftifyInfo

Author: hnrklssn

lib/ClangImporter/ImportDecl.cpp

@@ -8624,16 +8624,16 @@ ClangImporter::Implementation::importSwiftAttrAttributes(Decl *MappedDecl) {
 }
 
 namespace {
-class PointerParamInfoPrinter {
+class SwiftifyInfoPrinter {
 public:
   clang::ASTContext &ctx;
   llvm::raw_ostream &out;
   bool firstParam = true;
-  PointerParamInfoPrinter(clang::ASTContext &ctx, llvm::raw_ostream &out)
+  SwiftifyInfoPrinter(clang::ASTContext &ctx, llvm::raw_ostream &out)
       : ctx(ctx), out(out) {
     out << "@_SwiftifyImport(";
   }
-  ~PointerParamInfoPrinter() { out << ")"; }
+  ~SwiftifyInfoPrinter() { out << ")"; }
 
   void printCountedBy(const clang::CountAttributedType *CAT,
                       size_t pointerIndex) {
@@ -8676,7 +8676,7 @@ void ClangImporter::Implementation::importBoundsAttributes(
   {
     llvm::raw_svector_ostream out(MacroString);
 
-    PointerParamInfoPrinter printer(getClangASTContext(), out);
+    SwiftifyInfoPrinter printer(getClangASTContext(), out);
     for (auto [index, param] : llvm::enumerate(ClangDecl->parameters())) {
       if (auto CAT = param->getType()->getAs<clang::CountAttributedType>()) {
         printer.printCountedBy(CAT, index);

lib/Macros/Sources/SwiftMacros/SwiftifyImportMacro.swift

@@ -466,7 +466,7 @@ public struct SwiftifyImportMacro: PeerMacro {
     guard let calledExpr = enumConstructorExpr.calledExpression.as(MemberAccessExprSyntax.self)
     else {
       throw DiagnosticError(
-        "expected _PointerParam enum literal as argument, got '\(enumConstructorExpr)'",
+        "expected _SwiftifyInfo enum literal as argument, got '\(enumConstructorExpr)'",
         node: enumConstructorExpr)
     }
     return calledExpr.declName.baseName.text
@@ -564,7 +564,7 @@ public struct SwiftifyImportMacro: PeerMacro {
     let paramExpr = paramAST.expression
     guard let enumConstructorExpr = paramExpr.as(FunctionCallExprSyntax.self) else {
       throw DiagnosticError(
-        "expected _PointerParam enum literal as argument, got '\(paramExpr)'", node: paramExpr)
+        "expected _SwiftifyInfo enum literal as argument, got '\(paramExpr)'", node: paramExpr)
     }
     let enumName = try parseEnumName(enumConstructorExpr)
     switch enumName {
@@ -627,7 +627,7 @@ public struct SwiftifyImportMacro: PeerMacro {
       }
       if argByIndex[i] != nil {
         throw DiagnosticError(
-          "multiple _PointerParams referring to parameter with index "
+          "multiple _SwiftifyInfos referring to parameter with index "
             + "\(i): \(pointerArg) and \(argByIndex[i]!)", node: pointerArg.original)
       }
       argByIndex[i] = pointerArg

stdlib/public/core/SwiftifyImport.swift

@@ -3,7 +3,11 @@
 /// __must__ be string literals, because their contents are parsed by the `@_SwiftifyImport` macro.
 /// Only 1 instance of `countedBy`, `sizedBy` or `endedBy` can refer to each pointer index, however
 /// `nonescaping` is orthogonal to the rest and can (and should) overlap with other annotations.
-public enum _PointerParam {
+///
+/// This is not marked @available, because _SwiftifyImport is available for any target. Instances
+/// of _SwiftifyInfo should ONLY be passed as arguments directly to _SwiftifyImport, so they should
+/// not affect linkage since there are never any instances at runtime.
+public enum _SwiftifyInfo {
     /// Corresponds to the C `__counted_by(count)` attribute.
     /// Parameter pointer: index of pointer in function parameter list. Must be of type
     /// `Unsafe[Mutable]Pointer<T>[?]`, i.e. not an `UnsafeRawPointer`.
@@ -40,5 +44,5 @@ public enum _PointerParam {
 /// Parameter paramInfo: information about how the function uses the pointer passed to it. The
 /// safety of the generated wrapper function depends on this info being extensive and accurate.
 @attached(peer, names: overloaded)
-public macro _SwiftifyImport(_ paramInfo: _PointerParam...) =
+public macro _SwiftifyImport(_ paramInfo: _SwiftifyInfo...) =
     #externalMacro(module: "SwiftMacros", type: "SwiftifyImportMacro")

test/Macros/SwiftifyImport/MacroErrors/DynamicEnum.swift

@@ -2,8 +2,8 @@
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 
-let countedBy = _PointerParam.countedBy(pointer: 1, count: "len")
-// expected-error@+1{{expected _PointerParam enum literal as argument, got 'countedBy'}}
+let countedBy = _SwiftifyInfo.countedBy(pointer: 1, count: "len")
+// expected-error@+1{{expected _SwiftifyInfo enum literal as argument, got 'countedBy'}}
 @_SwiftifyImport(countedBy)
 func myFunc(_ ptr: UnsafePointer<CInt>, _ len: String) {
 }

test/Macros/SwiftifyImport/MacroErrors/SamePointer.swift

@@ -2,7 +2,7 @@
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir
 
-// expected-error@+1{{multiple _PointerParams referring to parameter with index 1: .countedBy(pointer: 1, count: "dummy", nonescaping: false) and .countedBy(pointer: 1, count: "len", nonescaping: false)}}
+// expected-error@+1{{multiple _SwiftifyInfos referring to parameter with index 1: .countedBy(pointer: 1, count: "dummy", nonescaping: false) and .countedBy(pointer: 1, count: "len", nonescaping: false)}}
 @_SwiftifyImport(.countedBy(pointer: 1, count: "len"), .countedBy(pointer: 1, count: "dummy"))
 func myFunc(_ ptr: UnsafePointer<CInt>, _ len: CInt, _ dummy: CInt) {
 }

test/abi/macOS/arm64/stdlib.swift

@@ -798,12 +798,12 @@ Added: _$ss7RawSpanVMa
 Added: _$ss7RawSpanVMn
 Added: _$ss7RawSpanVN
 
-// _PointerParam enum for _SwiftifyImports macro
-Added: _$ss13_PointerParamO11nonescapingyABSi_tcABmFWC
-Added: _$ss13_PointerParamO7endedByyABSi_SitcABmFWC
-Added: _$ss13_PointerParamO7sizedByyABSi_SStcABmFWC
-Added: _$ss13_PointerParamO9countedByyABSi_SStcABmFWC
-Added: _$ss13_PointerParamOMa
-Added: _$ss13_PointerParamOMn
-Added: _$ss13_PointerParamON
+// _SwiftifyInfo enum for _SwiftifyImports macro
+Added: _$ss13_SwiftifyInfoO11nonescapingyABSi_tcABmFWC
+Added: _$ss13_SwiftifyInfoO7endedByyABSi_SitcABmFWC
+Added: _$ss13_SwiftifyInfoO7sizedByyABSi_SStcABmFWC
+Added: _$ss13_SwiftifyInfoO9countedByyABSi_SStcABmFWC
+Added: _$ss13_SwiftifyInfoOMa
+Added: _$ss13_SwiftifyInfoOMn
+Added: _$ss13_SwiftifyInfoON
 

test/abi/macOS/x86_64/stdlib.swift

@@ -799,12 +799,12 @@ Added: _$ss7RawSpanVMa
 Added: _$ss7RawSpanVMn
 Added: _$ss7RawSpanVN
 
-// _PointerParam enum for _SwiftifyImports macro
-Added: _$ss13_PointerParamO11nonescapingyABSi_tcABmFWC
-Added: _$ss13_PointerParamO7endedByyABSi_SitcABmFWC
-Added: _$ss13_PointerParamO7sizedByyABSi_SStcABmFWC
-Added: _$ss13_PointerParamO9countedByyABSi_SStcABmFWC
-Added: _$ss13_PointerParamOMa
-Added: _$ss13_PointerParamOMn
-Added: _$ss13_PointerParamON
+// _SwiftifyInfo enum for _SwiftifyImports macro
+Added: _$ss13_SwiftifyInfoO11nonescapingyABSi_tcABmFWC
+Added: _$ss13_SwiftifyInfoO7endedByyABSi_SitcABmFWC
+Added: _$ss13_SwiftifyInfoO7sizedByyABSi_SStcABmFWC
+Added: _$ss13_SwiftifyInfoO9countedByyABSi_SStcABmFWC
+Added: _$ss13_SwiftifyInfoOMa
+Added: _$ss13_SwiftifyInfoOMn
+Added: _$ss13_SwiftifyInfoON
 

test/api-digester/stability-stdlib-abi-without-asserts.test

@@ -822,5 +822,5 @@ Func _SliceBuffer.withUnsafeMutableBufferPointer(_:) has mangled name changing f
 
 Struct String.Index has added a conformance to an existing protocol CustomDebugStringConvertible
 
-Enum _PointerParam is a new API without @available attribute
+Enum _SwiftifyInfo is a new API without @available attribute
 // *** DO NOT DISABLE OR XFAIL THIS TEST. *** (See comment above.)