Move @PointerBounds to stdlib core, support Implicitly Unwrapped types

hnrklssn · hnrklssn · commit 80b1d924a792 · 2024-10-28T17:32:01.000-07:00
diff --git a/lib/Macros/Sources/SwiftMacros/PointerBoundsMacro.swift b/lib/Macros/Sources/SwiftMacros/PointerBoundsMacro.swift
@@ -97,6 +97,9 @@ func transformType(_ prev: TypeSyntax, _ variant: Variant, _ isSizedBy: Bool) th
     if let optType = prev.as(OptionalTypeSyntax.self) {
         return TypeSyntax(optType.with(\.wrappedType, try transformType(optType.wrappedType, variant, isSizedBy)))
     }
+    if let impOptType = prev.as(ImplicitlyUnwrappedOptionalTypeSyntax.self) {
+        return try transformType(impOptType.wrappedType, variant, isSizedBy)
+    }
     guard let idType = prev.as(IdentifierTypeSyntax.self) else {
         throw DiagnosticError("expected pointer type, got \(prev) with kind \(prev.kind)", node: prev)
     }
diff --git a/stdlib/private/StdlibUnittest/CMakeLists.txt b/stdlib/private/StdlibUnittest/CMakeLists.txt
@@ -32,9 +32,6 @@ endif()
 if (SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING)
   list(APPEND swift_stdlib_unittest_modules "_StringProcessing")
 endif()
-if (SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS)
-  list(APPEND swift_stdlib_unittest_modules "_PointerBounds")
-endif()
 
 add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
diff --git a/stdlib/public/CMakeLists.txt b/stdlib/public/CMakeLists.txt
@@ -279,10 +279,6 @@ if(SWIFT_BUILD_STDLIB)
     add_subdirectory(StringProcessing)
     add_subdirectory(RegexBuilder)
   endif()
-
-  if(SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS)
-    add_subdirectory(PointerBounds)
-  endif()
 endif()
 
 if(SWIFT_BUILD_STDLIB AND NOT SWIFT_STDLIB_BUILD_ONLY_CORE_MODULES)
diff --git a/stdlib/public/PointerBounds/CMakeLists.txt b/stdlib/public/PointerBounds/CMakeLists.txt
diff --git a/stdlib/public/core/CMakeLists.txt b/stdlib/public/core/CMakeLists.txt
@@ -261,6 +261,11 @@ if(SWIFT_STDLIB_ENABLE_VECTOR_TYPES)
   list(APPEND SWIFTLIB_EMBEDDED_GYB_SOURCES SIMDConcreteOperations.swift.gyb SIMDVectorTypes.swift.gyb)
 endif()
 
+if (SWIFT_ENABLE_EXPERIMENTAL_POINTER_BOUNDS)
+  list(APPEND SWIFTLIB_SOURCES PointerBounds.swift)
+  list(APPEND SWIFTLIB_EMBEDDED_SOURCES PointerBounds.swift)
+endif()
+
 # Freestanding and Linux/Android builds both have failures to resolve.
 if(NOT BOOTSTRAPPING_MODE STREQUAL "OFF" AND NOT SWIFT_FREESTANDING_FLAVOR AND NOT SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" AND NOT SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")
   list(APPEND SWIFTLIB_SOURCES ObjectIdentifier+DebugDescription.swift)
diff --git a/stdlib/public/core/GroupInfo.json b/stdlib/public/core/GroupInfo.json
@@ -190,6 +190,7 @@
   ],
   "Pointer": [
     "Pointer.swift",
+    "PointerBounds.swift",
     "TemporaryAllocation.swift",
     "UnsafePointer.swift",
     "UnsafeRawPointer.swift",
diff --git a/stdlib/public/core/PointerBounds.swift b/stdlib/public/core/PointerBounds.swift
@@ -1,5 +1,3 @@
-import Swift
-
 /// Different ways to annotate pointer parameters using the `@PointerBounds` macro.
 /// All indices into parameter lists start at 1. Indices __must__ be integer literals, and strings
 /// __must__ be string literals, because their contents are parsed by the `@PointerBounds` macro.
diff --git a/test/Macros/PointerBounds/CountedBy/CountExpr.swift b/test/Macros/PointerBounds/CountedBy/CountExpr.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.countedBy(pointer: 1, count: "size * count"))
 func myFunc(_ ptr: UnsafePointer<CInt>, _ size: CInt, _ count: CInt) {
 }
diff --git a/test/Macros/PointerBounds/CountedBy/MultipleParams.swift b/test/Macros/PointerBounds/CountedBy/MultipleParams.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.countedBy(pointer: 1, count: "len"), .countedBy(pointer: 3, count: "len2"))
 func myFunc(_ ptr: UnsafePointer<CInt>, _ len: CInt, _ ptr2: UnsafePointer<CInt>, _ len2: CInt) {
 }
diff --git a/test/Macros/PointerBounds/CountedBy/Mutable.swift b/test/Macros/PointerBounds/CountedBy/Mutable.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.countedBy(pointer: 1, count: "len"))
 func myFunc(_ ptr: UnsafeMutablePointer<CInt>, _ len: CInt) {
 }
diff --git a/test/Macros/PointerBounds/CountedBy/MutableSpan.swift b/test/Macros/PointerBounds/CountedBy/MutableSpan.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.countedBy(pointer: 1, count: "len"), .nonescaping(pointer: 1))
 func myFunc(_ ptr: UnsafeMutablePointer<CInt>, _ len: CInt) {
 }
diff --git a/test/Macros/PointerBounds/CountedBy/Nullable.swift b/test/Macros/PointerBounds/CountedBy/Nullable.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.countedBy(pointer: 1, count: "len"))
 func myFunc(_ ptr: UnsafePointer<CInt>?, _ len: CInt) {
 }
diff --git a/test/Macros/PointerBounds/CountedBy/Return.swift b/test/Macros/PointerBounds/CountedBy/Return.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.countedBy(pointer: 1, count: "len"))
 func myFunc(_ ptr: UnsafePointer<CInt>, _ len: CInt) -> CInt {
 }
diff --git a/test/Macros/PointerBounds/CountedBy/SharedCount.swift b/test/Macros/PointerBounds/CountedBy/SharedCount.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.countedBy(pointer: 1, count: "len"), .countedBy(pointer: 2, count: "len"))
 func myFunc(_ ptr: UnsafePointer<CInt>, _ ptr2: UnsafePointer<CInt>, _ len: CInt) {
 }
diff --git a/test/Macros/PointerBounds/CountedBy/SimpleCount.swift b/test/Macros/PointerBounds/CountedBy/SimpleCount.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.countedBy(pointer: 1, count: "len"))
 func myFunc(_ ptr: UnsafePointer<CInt>, _ len: CInt) {
 }
diff --git a/test/Macros/PointerBounds/CountedBy/SimpleSpan.swift b/test/Macros/PointerBounds/CountedBy/SimpleSpan.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.countedBy(pointer: 1, count: "len"), .nonescaping(pointer: 1))
 func myFunc(_ ptr: UnsafePointer<CInt>, _ len: CInt) {
 }
diff --git a/test/Macros/PointerBounds/CountedBy/SimpleSpanWithReturn.swift b/test/Macros/PointerBounds/CountedBy/SimpleSpanWithReturn.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.countedBy(pointer: 1, count: "len"), .nonescaping(pointer: 1))
 func myFunc(_ ptr: UnsafePointer<CInt>, _ len: CInt) -> CInt {
 }
diff --git a/test/Macros/PointerBounds/CountedBy/Unwrapped.swift b/test/Macros/PointerBounds/CountedBy/Unwrapped.swift
@@ -0,0 +1,14 @@
+// REQUIRES: swift_swift_parser
+// REQUIRES: pointer_bounds
+
+// RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
+
+@PointerBounds(.countedBy(pointer: 1, count: "len"))
+func myFunc(_ ptr: UnsafePointer<CInt>!, _ len: CInt) {
+}
+
+// CHECK:      @_alwaysEmitIntoClient
+// CHECK-NEXT: func myFunc(_ ptr: UnsafeBufferPointer<CInt>) {
+// CHECK-NEXT:     myFunc(ptr.baseAddress!, CInt(exactly: ptr.count)!)
+// CHECK-NEXT: }
+
diff --git a/test/Macros/PointerBounds/MacroErrors/ArrayType.swift b/test/Macros/PointerBounds/MacroErrors/ArrayType.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 
-import _PointerBounds
-
 @PointerBounds(.countedBy(pointer: 1, count: "len"))
 // expected-error@+1{{expected pointer type, got [CInt] with kind arrayType}}
 func myFunc(_ ptr: [CInt], _ len: String) {
diff --git a/test/Macros/PointerBounds/MacroErrors/DynamicCountExpr.swift b/test/Macros/PointerBounds/MacroErrors/DynamicCountExpr.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 
-import _PointerBounds
-
 let countString = "len"
 // expected-error@+1{{expected string literal for 'count' parameter, got countString}}
 @PointerBounds(.countedBy(pointer: 1, count: countString))
diff --git a/test/Macros/PointerBounds/MacroErrors/DynamicEnum.swift b/test/Macros/PointerBounds/MacroErrors/DynamicEnum.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 
-import _PointerBounds
-
 let countedBy = PointerParam.countedBy(pointer: 1, count: "len")
 // expected-error@+1{{expected PointerParam enum literal as argument, got 'countedBy'}}
 @PointerBounds(countedBy)
diff --git a/test/Macros/PointerBounds/MacroErrors/DynamicPointerIndex.swift b/test/Macros/PointerBounds/MacroErrors/DynamicPointerIndex.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 
-import _PointerBounds
-
 let pointerIndex = 1
 // expected-error@+1{{expected integer literal, got 'pointerIndex'}}
 @PointerBounds(.countedBy(pointer: pointerIndex, count: "len"))
diff --git a/test/Macros/PointerBounds/MacroErrors/InvalidCount.swift b/test/Macros/PointerBounds/MacroErrors/InvalidCount.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 
-import _PointerBounds
-
 // expected-error@+1{{no parameter with name 'foo' in '_ ptr: UnsafePointer<CInt>, _ len: CInt'}}
 @PointerBounds(.countedBy(pointer: 1, count: "foo"))
 func myFunc(_ ptr: UnsafePointer<CInt>, _ len: CInt) {
diff --git a/test/Macros/PointerBounds/MacroErrors/PointerIndexOutOfBounds.swift b/test/Macros/PointerBounds/MacroErrors/PointerIndexOutOfBounds.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 
-import _PointerBounds
-
 // expected-error@+1{{pointer index out of bounds}}
 @PointerBounds(.countedBy(pointer: 3, count: "len"))
 // expected-note@+1{{function myFunc has parameter indices 1..2}}
diff --git a/test/Macros/PointerBounds/MacroErrors/SamePointer.swift b/test/Macros/PointerBounds/MacroErrors/SamePointer.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir
 
-import _PointerBounds
-
 // 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)}}
 @PointerBounds(.countedBy(pointer: 1, count: "len"), .countedBy(pointer: 1, count: "dummy"))
 func myFunc(_ ptr: UnsafePointer<CInt>, _ len: CInt, _ dummy: CInt) {
diff --git a/test/Macros/PointerBounds/MacroErrors/UnexpectedCountExpr.swift b/test/Macros/PointerBounds/MacroErrors/UnexpectedCountExpr.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 
-import _PointerBounds
-
 // expected-error@+1{{cannot convert value of type 'Int' to expected argument type 'String'}}
 @PointerBounds(.countedBy(pointer: 1, count: 2))
 func myFunc(_ ptr: UnsafePointer<CInt>, _ len: String) {
diff --git a/test/Macros/PointerBounds/MacroErrors/UnexpectedCountType.swift b/test/Macros/PointerBounds/MacroErrors/UnexpectedCountType.swift
@@ -6,8 +6,6 @@
 // RUN: not %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 // RUN: %target-typecheck-verify-swift %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 
-import _PointerBounds
-
 @PointerBounds(.countedBy(pointer: 1, count: "len"))
 func myFunc(_ ptr: UnsafePointer<CInt>, _ len: String) {
 }
diff --git a/test/Macros/PointerBounds/MacroErrors/UnexpectedPointerType.swift b/test/Macros/PointerBounds/MacroErrors/UnexpectedPointerType.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-typecheck-verify-swift -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 
-import _PointerBounds
-
 // expected-error@+2{{expected Unsafe[Mutable][Raw]Pointer type for type CInt - first type token is 'CInt'}}
 @PointerBounds(.countedBy(pointer: 1, count: "len"))
 func myFunc(_ ptr: CInt, _ len: CInt) {
diff --git a/test/Macros/PointerBounds/SizedBy/MultipleParams.swift b/test/Macros/PointerBounds/SizedBy/MultipleParams.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.sizedBy(pointer: 1, size: "size"), .sizedBy(pointer: 3, size: "size2"))
 func myFunc(_ ptr: UnsafeRawPointer, _ size: CInt, _ ptr2: UnsafeRawPointer, _ size2: CInt) {
 }
diff --git a/test/Macros/PointerBounds/SizedBy/Mutable.swift b/test/Macros/PointerBounds/SizedBy/Mutable.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.sizedBy(pointer: 1, size: "size"))
 func myFunc(_ ptr: UnsafeMutableRawPointer, _ size: CInt) {
 }
diff --git a/test/Macros/PointerBounds/SizedBy/MutableRawSpan.swift b/test/Macros/PointerBounds/SizedBy/MutableRawSpan.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.sizedBy(pointer: 1, size: "size"), .nonescaping(pointer: 1))
 func myFunc(_ ptr: UnsafeMutableRawPointer, _ size: CInt) {
 }
diff --git a/test/Macros/PointerBounds/SizedBy/Nullable.swift b/test/Macros/PointerBounds/SizedBy/Nullable.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.sizedBy(pointer: 1, size: "size"))
 func myFunc(_ ptr: UnsafeRawPointer?, _ size: CInt) {
 }
diff --git a/test/Macros/PointerBounds/SizedBy/Return.swift b/test/Macros/PointerBounds/SizedBy/Return.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.sizedBy(pointer: 1, size: "size"))
 func myFunc(_ ptr: UnsafeRawPointer, _ size: CInt) -> CInt {
 }
diff --git a/test/Macros/PointerBounds/SizedBy/SharedCount.swift b/test/Macros/PointerBounds/SizedBy/SharedCount.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.sizedBy(pointer: 1, size: "size"), .sizedBy(pointer: 2, size: "size"))
 func myFunc(_ ptr: UnsafeRawPointer, _ ptr2: UnsafeRawPointer, _ size: CInt) {
 }
diff --git a/test/Macros/PointerBounds/SizedBy/SimpleRawSpan.swift b/test/Macros/PointerBounds/SizedBy/SimpleRawSpan.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.sizedBy(pointer: 1, size: "size"), .nonescaping(pointer: 1))
 func myFunc(_ ptr: UnsafeRawPointer, _ size: CInt) {
 }
diff --git a/test/Macros/PointerBounds/SizedBy/SimpleRawSpanWithReturn.swift b/test/Macros/PointerBounds/SizedBy/SimpleRawSpanWithReturn.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.sizedBy(pointer: 1, size: "size"), .nonescaping(pointer: 1))
 func myFunc(_ ptr: UnsafeRawPointer, _ size: CInt) -> CInt {
 }
diff --git a/test/Macros/PointerBounds/SizedBy/SimpleSize.swift b/test/Macros/PointerBounds/SizedBy/SimpleSize.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.sizedBy(pointer: 1, size: "size"))
 func myFunc(_ ptr: UnsafeRawPointer, _ size: CInt) {
 }
diff --git a/test/Macros/PointerBounds/SizedBy/SizeExpr.swift b/test/Macros/PointerBounds/SizedBy/SizeExpr.swift
@@ -3,8 +3,6 @@
 
 // RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
 
-import _PointerBounds
-
 @PointerBounds(.sizedBy(pointer: 1, size: "size * count"))
 func myFunc(_ ptr: UnsafeRawPointer, _ size: CInt, _ count: CInt) {
 }
diff --git a/test/Macros/PointerBounds/SizedBy/Unwrapped.swift b/test/Macros/PointerBounds/SizedBy/Unwrapped.swift
@@ -0,0 +1,14 @@
+// REQUIRES: swift_swift_parser
+// REQUIRES: pointer_bounds
+
+// RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 | %FileCheck %s
+
+@PointerBounds(.sizedBy(pointer: 1, size: "len"))
+func myFunc(_ ptr: UnsafeRawPointer!, _ len: CInt) {
+}
+
+// CHECK:      @_alwaysEmitIntoClient
+// CHECK-NEXT: func myFunc(_ ptr: UnsafeRawBufferPointer) {
+// CHECK-NEXT:     myFunc(ptr.baseAddress!, CInt(exactly: ptr.count)!)
+// CHECK-NEXT: }
+
diff --git a/test/lit.cfg b/test/lit.cfg
@@ -2107,13 +2107,6 @@ config.substitutions.append(('%string_processing_module', string_processing_modu
 config.substitutions.append(('%/string_processing_module',
                              '/'.join(os.path.normpath(string_processing_module).split(os.sep))))
 
-# Add 'pointer_bounds_module' as the path to the _PointerBounds .swiftmodule file
-pointer_bounds_module = os.path.join(stdlib_dir, "_PointerBounds.swiftmodule",
-                                   target_specific_module_triple + ".swiftmodule")
-config.substitutions.append(('%pointer_bounds_module', pointer_bounds_module))
-config.substitutions.append(('%/pointer_bounds_module',
-                             '/'.join(os.path.normpath(pointer_bounds_module).split(os.sep))))
-
 back_deployment_runtime = lit_config.params.get('back_deployment_runtime', None)
 if back_deployment_runtime is not None:
     config.available_features.add('back_deployment_runtime')

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,9 @@ func transformType(_ prev: TypeSyntax, _ variant: Variant, _ isSizedBy: Bool) th`
`97`	`97`	`if let optType = prev.as(OptionalTypeSyntax.self) {`
`98`	`98`	`return TypeSyntax(optType.with(\.wrappedType, try transformType(optType.wrappedType, variant, isSizedBy)))`
`99`	`99`	`}`
	`100`	`+ if let impOptType = prev.as(ImplicitlyUnwrappedOptionalTypeSyntax.self) {`
	`101`	`+ return try transformType(impOptType.wrappedType, variant, isSizedBy)`
	`102`	`+ }`
`100`	`103`	`guard let idType = prev.as(IdentifierTypeSyntax.self) else {`
`101`	`104`	`throw DiagnosticError("expected pointer type, got \(prev) with kind \(prev.kind)", node: prev)`
`102`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import Swift`
`2`		`-`
`3`	`1`	/// Different ways to annotate pointer parameters using the `@PointerBounds` macro.
`4`	`2`	`/// All indices into parameter lists start at 1. Indices __must__ be integer literals, and strings`
`5`	`3`	/// __must__ be string literals, because their contents are parsed by the `@PointerBounds` macro.
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`
`4`	`4`	`// RUN: %target-swift-frontend %s -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions 2>&1 \| %FileCheck %s`
`5`	`5`
`6`		`-import _PointerBounds`
`7`		`-`
`8`	`6`	`@PointerBounds(.countedBy(pointer: 1, count: "size * count"))`
`9`	`7`	`func myFunc(_ ptr: UnsafePointer<CInt>, _ size: CInt, _ count: CInt) {`
`10`	`8`	`}`