From 3e4ddb13d679c55e663738962092d1c14c217fbb Mon Sep 17 00:00:00 2001 From: zoecarver Date: Tue, 7 Jul 2020 14:12:23 -0700 Subject: [PATCH] [NFC] Remove __swift_mode_t. Removes the "__swift_mode_t" type from SwiftShims. This type is no longer used anywhere. --- stdlib/public/SwiftShims/LibcShims.h | 20 -------------------- stdlib/public/stubs/LibcShims.cpp | 5 ----- 2 files changed, 25 deletions(-) diff --git a/stdlib/public/SwiftShims/LibcShims.h b/stdlib/public/SwiftShims/LibcShims.h index 9c30303ef2094..6abe6880d8ff8 100644 --- a/stdlib/public/SwiftShims/LibcShims.h +++ b/stdlib/public/SwiftShims/LibcShims.h @@ -32,26 +32,6 @@ extern "C" { #endif -// This declaration might not be universally correct. -// We verify its correctness for the current platform in the runtime code. -#if defined(__linux__) -# if defined(__ANDROID__) && !(defined(__aarch64__) || defined(__x86_64__)) -typedef __swift_uint16_t __swift_mode_t; -# else -typedef __swift_uint32_t __swift_mode_t; -# endif -#elif defined(__APPLE__) -typedef __swift_uint16_t __swift_mode_t; -#elif defined(_WIN32) -typedef __swift_int32_t __swift_mode_t; -#elif defined(__wasi__) -typedef __swift_uint32_t __swift_mode_t; -#elif defined(__OpenBSD__) -typedef __swift_uint32_t __swift_mode_t; -#else // just guessing -typedef __swift_uint16_t __swift_mode_t; -#endif - // Input/output SWIFT_RUNTIME_STDLIB_INTERNAL diff --git a/stdlib/public/stubs/LibcShims.cpp b/stdlib/public/stubs/LibcShims.cpp index e47222910b5dd..092581f8cedc6 100644 --- a/stdlib/public/stubs/LibcShims.cpp +++ b/stdlib/public/stubs/LibcShims.cpp @@ -31,11 +31,6 @@ #include "../SwiftShims/LibcShims.h" -#if !defined(_WIN32) || defined(__CYGWIN__) -static_assert(std::is_same::value, - "__swift_mode_t must be defined as equivalent to mode_t in LibcShims.h"); -#endif - SWIFT_RUNTIME_STDLIB_INTERNAL int _swift_stdlib_putchar_unlocked(int c) { #if defined(_WIN32)