Skip to content

swift-plugin-server: remove standard headers #68357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

swift-plugin-server: remove standard headers #68357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e05fb0
swift-plugin-server: remove standard headers
compnerd Sep 6, 2023
7acf3e9
Update PluginServer.h
compnerd Sep 6, 2023
239f779
Update PluginServer.h
compnerd Sep 6, 2023
683b6d7
More SwiftInt conversions
compnerd Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/swift-plugin-server/Sources/CSwiftPluginServer/PluginServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void PluginServer_destroyConnection(const void *server) {
delete static_cast<const ConnectionHandle *>(server);
}

size_t PluginServer_read(const void *server, void *data, size_t nbyte) {
SwiftInt PluginServer_read(const void *server, void *data, SwiftUInt nbyte) {
const auto *connection = static_cast<const ConnectionHandle *>(server);
#if defined(_WIN32)
return _read(connection->inputFD, data, nbyte);
Expand All @@ -127,7 +127,7 @@ size_t PluginServer_read(const void *server, void *data, size_t nbyte) {
#endif
}

size_t PluginServer_write(const void *server, const void *data, size_t nbyte) {
SwiftInt PluginServer_write(const void *server, const void *data, SwiftUInt nbyte) {
const auto *connection = static_cast<const ConnectionHandle *>(server);
#if defined(_WIN32)
return _write(connection->outputFD, data, nbyte);
Expand Down
66 changes: 63 additions & 3 deletions tools/swift-plugin-server/Sources/CSwiftPluginServer/include/PluginServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,68 @@
#ifndef SWIFT_PLUGINSERVER_PLUGINSERVER_H
#define SWIFT_PLUGINSERVER_PLUGINSERVER_H

#include <stddef.h>
// NOTE: Partially ported from SwiftShim's SwiftStdint.h. We cannot include
// that header here because it belongs to the runtime, but we need the same
// logic for interoperability with Swift code in the compiler itself.
// stdint.h is provided by Clang, but it dispatches to libc's stdint.h. As a
// result, using stdint.h here would pull in Darwin module (which includes
// libc). This creates a dependency cycle, so we can't use stdint.h in
// SwiftShims.
// On Linux, the story is different. We get the error message
// "/usr/include/x86_64-linux-gnu/sys/types.h:146:10: error: 'stddef.h' file not
// found"
// This is a known Clang/Ubuntu bug.

// Clang has been defining __INTxx_TYPE__ macros for a long time.
// __UINTxx_TYPE__ are defined only since Clang 3.5.
#if defined(_MSC_VER) && !defined(__clang__)
typedef __int64 __swiftc_int64_t;
typedef unsigned __int64 __swiftc_uint64_t;
typedef int __swiftc_int32_t;
typedef unsigned int __swiftc_uint32_t;
#elif !defined(__APPLE__) && !defined(__linux__) && !defined(__OpenBSD__) && !defined(__wasi__)
#include <stdint.h>
typedef int64_t __swiftc_int64_t;
typedef uint64_t __swiftc_uint64_t;
typedef int32_t __swiftc_int32_t;
typedef uint32_t __swiftc_uint32_t;
typedef intptr_t __swiftc_intptr_t;
typedef uintptr_t __swiftc_uintptr_t;
#else
typedef __INT64_TYPE__ __swiftc_int64_t;
#ifdef __UINT64_TYPE__
typedef __UINT64_TYPE__ __swiftc_uint64_t;
#else
typedef unsigned __INT64_TYPE__ __swiftc_uint64_t;
#endif

typedef __INT32_TYPE__ __swiftc_int32_t;
#ifdef __UINT32_TYPE__
typedef __UINT32_TYPE__ __swiftc_uint32_t;
#else
typedef unsigned __INT32_TYPE__ __swiftc_uint32_t;
#endif
#endif

#define __swiftc_join3(a,b,c) a ## b ## c

#define __swiftc_intn_t(n) __swiftc_join3(__swiftc_int, n, _t)
#define __swiftc_uintn_t(n) __swiftc_join3(__swiftc_uint, n, _t)

#if defined(_MSC_VER) && !defined(__clang__)
#if defined(_WIN64)
typedef __swiftc_int64_t SwiftInt;
typedef __swiftc_uint64_t SwiftUInt;
#elif defined(_WIN32)
typedef __swiftc_int32_t SwiftInt;
typedef __swiftc_uint32_t SwiftUInt;
#else
#error unknown windows pointer width
#endif
#else
typedef __swiftc_intn_t(__INTPTR_WIDTH__) SwiftInt;
typedef __swiftc_uintn_t(__INTPTR_WIDTH__) SwiftUInt;
#endif

#ifdef __cplusplus
extern "C" {
Expand All @@ -32,10 +92,10 @@ const void *PluginServer_createConnection(const char **errorMessage);
void PluginServer_destroyConnection(const void *connHandle);

/// Read bytes from the IPC communication handle.
size_t PluginServer_read(const void *connHandle, void *data, size_t nbyte);
SwiftInt PluginServer_read(const void *connHandle, void *data, SwiftUInt nbyte);

/// Write bytes to the IPC communication handle.
size_t PluginServer_write(const void *connHandle, const void *data, size_t nbyte);
SwiftInt PluginServer_write(const void *connHandle, const void *data, SwiftUInt nbyte);

//===----------------------------------------------------------------------===//
// Dynamic link
Expand Down