[CASTBridging] Typedefs for opaque pointer types

Author: rintaro

include/swift/AST/CASTBridging.h

@@ -289,26 +289,29 @@ void Type_dump(void *);
 // Plugins
 //===----------------------------------------------------------------------===//
 
+typedef void *PluginHandle;
+typedef const void *PluginCapabilityPtr;
+
 /// Set a capability data to the plugin object. Since the data is just a opaque
 /// pointer, it's not used in AST at all.
-void Plugin_setCapability(void *handle, const void *data);
+void Plugin_setCapability(PluginHandle handle, PluginCapabilityPtr data);
 
-/// Get a coapability data set by \c Plugin_setCapability .
-const void *_Nullable Plugin_getCapability(void *handle);
+/// Get a capability data set by \c Plugin_setCapability .
+PluginCapabilityPtr _Nullable Plugin_getCapability(PluginHandle handle);
 
 /// Lock the plugin. Clients should lock it during sending and recving the
 /// response.
-void Plugin_lock(void *handle);
+void Plugin_lock(PluginHandle handle);
 
 /// Unlock the plugin.
-void Plugin_unlock(void *handle);
+void Plugin_unlock(PluginHandle handle);
 
 /// Sends the message to the plugin, returns true if there was an error.
 /// Clients should receive the response  by \c Plugin_waitForNextMessage .
-_Bool Plugin_sendMessage(void *handle, const BridgedData data);
+_Bool Plugin_sendMessage(PluginHandle handle, const BridgedData data);
 
 /// Receive a message from the plugin.
-_Bool Plugin_waitForNextMessage(void *handle, BridgedData *data);
+_Bool Plugin_waitForNextMessage(PluginHandle handle, BridgedData *data);
 
 #ifdef __cplusplus
 }

lib/AST/CASTBridging.cpp

@@ -628,33 +628,33 @@ void Type_dump(void *expr) { ((TypeRepr *)expr)->dump(); }
 // Plugins
 //===----------------------------------------------------------------------===//
 
-const void *Plugin_getCapability(void *handle) {
+PluginCapabilityPtr Plugin_getCapability(PluginHandle handle) {
   auto *plugin = static_cast<LoadedExecutablePlugin *>(handle);
   return plugin->getCapability();
 }
 
-void Plugin_setCapability(void *handle, const void *data) {
+void Plugin_setCapability(PluginHandle handle, PluginCapabilityPtr data) {
   auto *plugin = static_cast<LoadedExecutablePlugin *>(handle);
   plugin->setCapability(data);
 }
 
-void Plugin_lock(void *handle) {
+void Plugin_lock(PluginHandle handle) {
   auto *plugin = static_cast<LoadedExecutablePlugin *>(handle);
   plugin->lock();
 }
 
-void Plugin_unlock(void *handle) {
+void Plugin_unlock(PluginHandle handle) {
   auto *plugin = static_cast<LoadedExecutablePlugin *>(handle);
   plugin->unlock();
 }
 
-bool Plugin_sendMessage(void *handle, const BridgedData data) {
+bool Plugin_sendMessage(PluginHandle handle, const BridgedData data) {
   auto *plugin = static_cast<LoadedExecutablePlugin *>(handle);
   StringRef message(data.baseAddress, data.size);
   return plugin->sendMessage(message);
 }
 
-bool Plugin_waitForNextMessage(void *handle, BridgedData *out) {
+bool Plugin_waitForNextMessage(PluginHandle handle, BridgedData *out) {
   auto *plugin = static_cast<LoadedExecutablePlugin *>(handle);
   auto result = plugin->waitForNextMessage();
   auto outPtr = malloc(result.size());