Revert "Migrate from UnsafePointer<Void> to UnsafeRawPointer. (#3724)"

This reverts commit ece0951.

This results in lldb failues on linux that I can't readily debug.
Backing out until they can be resolved.

Author: atrick

benchmark/utils/DriverUtils.swift

@@ -220,9 +220,9 @@ func internalMedian(_ inputs: [UInt64]) -> UInt64 {
 #if SWIFT_RUNTIME_ENABLE_LEAK_CHECKER
 
 @_silgen_name("swift_leaks_startTrackingObjects")
-func startTrackingObjects(_: UnsafeMutableRawPointer) -> ()
+func startTrackingObjects(_: UnsafeMutablePointer<Void>) -> ()
 @_silgen_name("swift_leaks_stopTrackingObjects")
-func stopTrackingObjects(_: UnsafeMutableRawPointer) -> Int
+func stopTrackingObjects(_: UnsafeMutablePointer<Void>) -> Int
 
 #endif
 
@@ -235,14 +235,14 @@ class SampleRunner {
     // Start the timer.
 #if SWIFT_RUNTIME_ENABLE_LEAK_CHECKER
     var str = name
-    startTrackingObjects(UnsafeMutableRawPointer(str._core.startASCII))
+    startTrackingObjects(UnsafeMutablePointer<Void>(str._core.startASCII))
 #endif
     let start_ticks = mach_absolute_time()
     fn(Int(num_iters))
     // Stop the timer.
     let end_ticks = mach_absolute_time()
 #if SWIFT_RUNTIME_ENABLE_LEAK_CHECKER
-    stopTrackingObjects(UnsafeMutableRawPointer(str._core.startASCII))
+    stopTrackingObjects(UnsafeMutablePointer<Void>(str._core.startASCII))
 #endif
 
     // Compute the spent time and the scaling factor.

docs/proposals/CPointerInteropLanguageModel.rst

@@ -61,7 +61,7 @@ accept any of the following:
   array, and lifetime-extended for the duration of the callee.
 
 As a special case, when a function is declared as taking an
-``UnsafeMutableRawPointer`` argument, it can accept the same operands as
+``UnsafeMutablePointer<Void>`` argument, it can accept the same operands as
 ``UnsafeMutablePointer<T>`` for any type T.
 
 So if you have a function declared::
@@ -80,7 +80,7 @@ You can call it as any of::
 
 And if you have a function declared::
 
-  func bar(_ x: UnsafeMutableRawPointer)
+  func bar(_ x: UnsafeMutablePointer<Void>)
 
 You can call it as any of::
 
@@ -139,7 +139,7 @@ accept any of the following:
   array, and lifetime-extended for the duration of the callee.
 
 As a special case, when a function is declared as taking an
-``UnsafeRawPointer`` argument, it can accept the same operands as
+``UnsafePointer<Void>`` argument, it can accept the same operands as
 ``UnsafePointer<T>`` for any type ``T``. Pointers to certain integer
 types can furthermore interoperate with strings; see `Strings`_ below.
 
@@ -158,7 +158,7 @@ You can call it as any of::
 
 And if you have a function declared::
 
-  func zang(_ x: UnsafeRawPointer)
+  func zang(_ x: UnsafePointer<Void>)
 
 You can call it as any of::
 
@@ -175,7 +175,7 @@ You can call it as any of::
   zang(ints)
 
 A type checker limitation prevents array literals from being passed directly
-to ``UnsafeRawPointer`` arguments without type annotation. As a
+to ``UnsafePointer<Void>`` arguments without type annotation. As a
 workaround, you can bind the array literal to a constant, as above, or 
 specify the array type with ``as``::
 

lib/AST/Module.cpp

@@ -371,16 +371,23 @@ VarDecl *Module::getDSOHandle() {
   if (DSOHandle)
     return DSOHandle;
 
-  auto unsafeMutableRawPtr = getASTContext().getUnsafeMutableRawPointerDecl();
-  if (!unsafeMutableRawPtr)
+  auto unsafeMutablePtr = getASTContext().getUnsafeMutablePointerDecl();
+  if (!unsafeMutablePtr)
     return nullptr;
 
+  Type arg;
   auto &ctx = getASTContext();
+  if (auto voidDecl = ctx.getVoidDecl()) {
+    arg = voidDecl->getDeclaredInterfaceType();
+  } else {
+    arg = TupleType::getEmpty(ctx);
+  }
+  
+  Type type = BoundGenericType::get(unsafeMutablePtr, Type(), { arg });
   auto handleVar = new (ctx) VarDecl(/*IsStatic=*/false, /*IsLet=*/false,
                                      SourceLoc(),
                                      ctx.getIdentifier("__dso_handle"),
-                                     unsafeMutableRawPtr->getDeclaredType(),
-                                     Files[0]);
+                                     type, Files[0]);
   handleVar->setImplicit(true);
   handleVar->getAttrs().add(
     new (ctx) SILGenNameAttr("__dso_handle", /*Implicit=*/true));

lib/ClangImporter/ImportType.cpp

@@ -287,7 +287,6 @@ namespace {
 
     ImportResult VisitPointerType(const clang::PointerType *type) {      
       auto pointeeQualType = type->getPointeeType();
-      auto quals = pointeeQualType.getQualifiers();
 
       // Special case for NSZone*, which has its own Swift wrapper.
       if (const clang::RecordType *pointee =
@@ -304,19 +303,7 @@ namespace {
             return {wrapperTy, ImportHint::OtherPointer};
         }
       }
-
-      // Import 'void*' as 'UnsafeMutableRawPointer' and 'const void*' as
-      // 'UnsafeRawPointer'. This is Swift's version of an untyped pointer. Note
-      // that 'Unsafe[Mutable]Pointer<T>' implicitly converts to
-      // 'Unsafe[Mutable]RawPointer' for interoperability.
-      if (pointeeQualType->isVoidType()) {
-        return {
-          (quals.hasConst() ? Impl.SwiftContext.getUnsafeRawPointerDecl()
-           : Impl.SwiftContext.getUnsafeMutableRawPointerDecl())
-            ->getDeclaredType(),
-            ImportHint::OtherPointer};
-      }
-
+      
       // All other C pointers to concrete types map to
       // UnsafeMutablePointer<T> or OpaquePointer (FIXME:, except in
       // parameter position under the pre-
@@ -349,6 +336,8 @@ namespace {
         };
       }
 
+      auto quals = pointeeQualType.getQualifiers();
+      
       if (quals.hasConst()) {
         return {Impl.getNamedSwiftTypeSpecialization(Impl.getStdlibModule(),
                                                      "UnsafePointer",

lib/IDE/CodeCompletion.cpp

@@ -4656,7 +4656,7 @@ static void addExprKeywords(CodeCompletionResultSink &Sink) {
   // Same: Swift.IntegerLiteralType.
   AddKeyword("#line", "Int", CodeCompletionKeywordKind::pound_line);
   AddKeyword("#column", "Int", CodeCompletionKeywordKind::pound_column);
-  AddKeyword("#dsohandle", "UnsafeMutableRawPointer", CodeCompletionKeywordKind::pound_dsohandle);
+  AddKeyword("#dsohandle", "UnsafeMutablePointer<Void>", CodeCompletionKeywordKind::pound_dsohandle);
 }
 
 static void addAnyTypeKeyword(CodeCompletionResultSink &Sink) {

lib/PrintAsObjC/PrintAsObjC.cpp

@@ -949,8 +949,6 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
       MAP(Bool, "BOOL", false);
 
       MAP(OpaquePointer, "void *", true);
-      MAP(UnsafeRawPointer, "void const *", true);
-      MAP(UnsafeMutableRawPointer, "void *", true);
 
       Identifier ID_ObjectiveC = ctx.Id_ObjectiveC;
       specialNames[{ID_ObjectiveC, ctx.getIdentifier("ObjCBool")}] 

lib/Sema/CSGen.cpp

@@ -1227,7 +1227,7 @@ namespace {
         return visitLiteralExpr(expr);
 
       case MagicIdentifierLiteralExpr::DSOHandle: {
-        // #dsohandle has type UnsafeMutableRawPointer.
+        // #dsohandle has type UnsafeMutablePointer<Void>.
         auto &tc = CS.getTypeChecker();
         if (tc.requirePointerArgumentIntrinsics(expr->getLoc()))
           return nullptr;

stdlib/private/SwiftPrivatePthreadExtras/SwiftPrivatePthreadExtras.swift

@@ -27,7 +27,7 @@ internal class PthreadBlockContext {
   /// Execute the block, and return an `UnsafeMutablePointer` to memory
   /// allocated with `UnsafeMutablePointer.alloc` containing the result of the
   /// block.
-  func run() -> UnsafeMutableRawPointer { fatalError("abstract") }
+  func run() -> UnsafeMutablePointer<Void> { fatalError("abstract") }
 }
 
 internal class PthreadBlockContextImpl<Argument, Result>: PthreadBlockContext {
@@ -40,17 +40,17 @@ internal class PthreadBlockContextImpl<Argument, Result>: PthreadBlockContext {
     super.init()
   }
 
-  override func run() -> UnsafeMutableRawPointer {
+  override func run() -> UnsafeMutablePointer<Void> {
     let result = UnsafeMutablePointer<Result>.allocate(capacity: 1)
     result.initialize(to: block(arg))
-    return UnsafeMutableRawPointer(result)
+    return UnsafeMutablePointer(result)
   }
 }
 
 /// Entry point for `pthread_create` that invokes a block context.
 internal func invokeBlockContext(
-  _ contextAsVoidPointer: UnsafeMutableRawPointer?
-) -> UnsafeMutableRawPointer! {
+  _ contextAsVoidPointer: UnsafeMutablePointer<Void>?
+) -> UnsafeMutablePointer<Void>! {
   // The context is passed in +1; we're responsible for releasing it.
   let context = Unmanaged<PthreadBlockContext>
     .fromOpaque(contextAsVoidPointer!)
@@ -95,14 +95,12 @@ public func _stdlib_pthread_join<Result>(
   _ thread: pthread_t,
   _ resultType: Result.Type
 ) -> (CInt, Result?) {
-  var threadResultRawPtr: UnsafeMutableRawPointer? = nil
-  let result = pthread_join(thread, &threadResultRawPtr)
+  var threadResultPtr: UnsafeMutablePointer<Void>? = nil
+  let result = pthread_join(thread, &threadResultPtr)
   if result == 0 {
-    let threadResultPtr = threadResultRawPtr!.assumingMemoryBound(
-      to: Result.self)
-    let threadResult = threadResultPtr.pointee
-    threadResultPtr.deinitialize()
-    threadResultPtr.deallocate(capacity: 1)
+    let threadResult = UnsafeMutablePointer<Result>(threadResultPtr!).pointee
+    threadResultPtr!.deinitialize()
+    threadResultPtr!.deallocate(capacity: 1)
     return (result, threadResult)
   } else {
     return (result, nil)

stdlib/private/SwiftReflectionTest/SwiftReflectionTest.swift

@@ -48,7 +48,7 @@ public enum InstanceKind : UInt8 {
 /// Represents a section in a loaded image in this process.
 internal struct Section {
   /// The absolute start address of the section's data in this address space.
-  let startAddress: UnsafeRawPointer
+  let startAddress: UnsafePointer<Void>
 
   /// The size of the section in bytes.
   let size: UInt
@@ -211,7 +211,7 @@ internal func sendBytes() {
   let count = Int(readUInt())
   debugLog("Parent requested \(count) bytes from \(address)")
   var totalBytesWritten = 0
-  var pointer = unsafeBitCast(address, to: UnsafeMutableRawPointer.self)
+  var pointer = unsafeBitCast(address, to: UnsafeMutablePointer<Void>.self)
   while totalBytesWritten < count {
     let bytesWritten = Int(fwrite(pointer, 1, Int(count), stdout))
     fflush(stdout)
@@ -228,7 +228,7 @@ internal func sendSymbolAddress() {
   debugLog("BEGIN \(#function)"); defer { debugLog("END \(#function)") }
   let name = readLine()!
   name.withCString {
-    let handle = unsafeBitCast(Int(-2), to: UnsafeMutableRawPointer.self)
+    let handle = unsafeBitCast(Int(-2), to: UnsafeMutablePointer<Void>.self)
     let symbol = dlsym(handle, $0)
     let symbolAddress = unsafeBitCast(symbol, to: UInt.self)
     sendValue(symbolAddress)
@@ -247,7 +247,7 @@ internal func sendStringLength() {
 /// Send the size of this architecture's pointer type.
 internal func sendPointerSize() {
   debugLog("BEGIN \(#function)"); defer { debugLog("END \(#function)") }
-  let pointerSize = UInt8(sizeof(UnsafeRawPointer.self))
+  let pointerSize = UInt8(sizeof(UnsafePointer<Void>.self))
   sendValue(pointerSize)
 }
 
@@ -412,8 +412,8 @@ struct ThickFunction3 {
 }
 
 struct ThickFunctionParts {
-  var function: UnsafeRawPointer
-  var context: Optional<UnsafeRawPointer>
+  var function: UnsafePointer<Void>
+  var context: Optional<UnsafePointer<Void>>
 }
 
 /// Reflect a closure context. The given function must be a Swift-native

stdlib/public/Platform/Platform.swift

@@ -219,7 +219,7 @@ internal func _swift_Platform_fcntl(
 internal func _swift_Platform_fcntlPtr(
   _ fd: Int32,
   _ cmd: Int32,
-  _ ptr: UnsafeMutableRawPointer
+  _ ptr: UnsafeMutablePointer<Void>
 ) -> Int32
 
 public func fcntl(
@@ -240,7 +240,7 @@ public func fcntl(
 public func fcntl(
   _ fd: Int32,
   _ cmd: Int32,
-  _ ptr: UnsafeMutableRawPointer
+  _ ptr: UnsafeMutablePointer<Void>
 ) -> Int32 {
   return _swift_Platform_fcntlPtr(fd, cmd, ptr)
 }
@@ -313,7 +313,7 @@ internal func _swift_Platform_ioctl(
 internal func _swift_Platform_ioctlPtr(
   _ fd: CInt,
   _ request: UInt,
-  _ ptr: UnsafeMutableRawPointer
+  _ ptr: UnsafeMutablePointer<Void>
 ) -> CInt
 
 public func ioctl(
@@ -327,7 +327,7 @@ public func ioctl(
 public func ioctl(
   _ fd: CInt,
   _ request: UInt,
-  _ ptr: UnsafeMutableRawPointer
+  _ ptr: UnsafeMutablePointer<Void>
 ) -> CInt {
   return _swift_Platform_ioctlPtr(fd, request, ptr)
 }

stdlib/public/SDK/CoreAudio/CoreAudio.swift

@@ -14,23 +14,20 @@
 
 extension UnsafeBufferPointer {
   /// Initialize an `UnsafeBufferPointer<Element>` from an `AudioBuffer`.
-  /// Binds the the buffer's memory type to `Element`.
   public init(_ audioBuffer: AudioBuffer) {
-    let count = Int(audioBuffer.mDataByteSize) / strideof(Element.self)
-    let elementPtr = audioBuffer.mData?.bindMemory(
-      to: Element.self, capacity: count)
-    self.init(start: elementPtr, count: count)
+    self.init(
+      start: UnsafePointer<Element>(audioBuffer.mData),
+      count: Int(audioBuffer.mDataByteSize) / strideof(Element.self))
   }
 }
 
 extension UnsafeMutableBufferPointer {
   /// Initialize an `UnsafeMutableBufferPointer<Element>` from an
   /// `AudioBuffer`.
   public init(_ audioBuffer: AudioBuffer) {
-    let count = Int(audioBuffer.mDataByteSize) / strideof(Element.self)
-    let elementPtr = audioBuffer.mData?.bindMemory(
-      to: Element.self, capacity: count)
-    self.init(start: elementPtr, count: count)
+    self.init(
+      start: UnsafeMutablePointer<Element>(audioBuffer.mData),
+      count: Int(audioBuffer.mDataByteSize) / strideof(Element.self))
   }
 }
 
@@ -42,7 +39,7 @@ extension AudioBuffer {
     numberOfChannels: Int
   ) {
     self.mNumberChannels = UInt32(numberOfChannels)
-    self.mData = UnsafeMutableRawPointer(typedBuffer.baseAddress)
+    self.mData = UnsafeMutablePointer<Void>(typedBuffer.baseAddress)
     self.mDataByteSize = UInt32(typedBuffer.count * strideof(Element.self))
   }
 }
@@ -71,10 +68,8 @@ extension AudioBufferList {
     _precondition(ablMemory != nil,
       "failed to allocate memory for an AudioBufferList")
 
-    let listPtr = ablMemory!.bindMemory(to: AudioBufferList.self, capacity: 1)
-    (ablMemory! + strideof(AudioBufferList.self)).bindMemory(
-      to: AudioBuffer.self, capacity: maximumBuffers)
-    let abl = UnsafeMutableAudioBufferListPointer(listPtr)
+    let abl = UnsafeMutableAudioBufferListPointer(
+        UnsafeMutablePointer<AudioBufferList>(ablMemory!))
     abl.count = maximumBuffers
     return abl
   }
@@ -113,8 +108,7 @@ public struct UnsafeMutableAudioBufferListPointer {
     // AudioBufferList has one AudioBuffer in a "flexible array member".
     // Position the pointer after that, and skip one AudioBuffer back.  This
     // brings us to the start of AudioBuffer array.
-    let rawPtr = UnsafeMutableRawPointer(unsafeMutablePointer + 1)
-    return rawPtr.assumingMemoryBound(to: AudioBuffer.self) - 1
+    return UnsafeMutablePointer<AudioBuffer>(unsafeMutablePointer + 1) - 1
   }
 
   // FIXME: the properties 'unsafePointer' and 'unsafeMutablePointer' should be