Skip to content

stdlib: adjust the shims for MSVC mode compilation #19277

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

Merged
merged 1 commit into from
Sep 13, 2018
Merged

stdlib: adjust the shims for MSVC mode compilation #19277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions stdlib/public/SwiftShims/RefCount.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,11 +1406,20 @@ typedef swift::InlineRefCounts InlineRefCounts;
#endif

// These assertions apply to both the C and the C++ declarations.
#if defined(_MSC_VER) && !defined(__clang__)
static_assert(sizeof(InlineRefCounts) == sizeof(InlineRefCountsPlaceholder),
"InlineRefCounts and InlineRefCountsPlaceholder must match");
static_assert(sizeof(InlineRefCounts) == sizeof(__swift_uintptr_t),
"InlineRefCounts must be pointer-sized");
static_assert(__alignof(InlineRefCounts) == __alignof(__swift_uintptr_t),
"InlineRefCounts must be pointer-aligned");
#else
_Static_assert(sizeof(InlineRefCounts) == sizeof(InlineRefCountsPlaceholder),
"InlineRefCounts and InlineRefCountsPlaceholder must match");
_Static_assert(sizeof(InlineRefCounts) == sizeof(__swift_uintptr_t),
"InlineRefCounts must be pointer-sized");
_Static_assert(_Alignof(InlineRefCounts) == _Alignof(__swift_uintptr_t),
"InlineRefCounts must be pointer-aligned");
#endif

#endif
12 changes: 12 additions & 0 deletions stdlib/public/SwiftShims/SwiftStdint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,20 @@ typedef unsigned __INT8_TYPE__ __swift_uint8_t;
#define __swift_intn_t(n) __swift_join3(__swift_int, n, _t)
#define __swift_uintn_t(n) __swift_join3(__swift_uint, n, _t)

#if defined(_MSC_VER) && !defined(__clang__)
#if defined(_WIN32)
typedef __swift_int32_t __swift_intptr_t;
typedef __swift_uint32_t __swift_uintptr_t;
#elif defined(_WIN64)
typedef __swift_int64_t __swift_intptr_t;
typedef __swift_uint64_t __swift_uintptr_t;
#else
#error unknown windows pointer width
#endif
#else
typedef __swift_intn_t(__INTPTR_WIDTH__) __swift_intptr_t;
typedef __swift_uintn_t(__INTPTR_WIDTH__) __swift_uintptr_t;
#endif
#endif

#endif // SWIFT_STDLIB_SHIMS_SWIFT_STDINT_H