averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2026-06-20 15:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

stdlib: add SWIFT_RUNTIME_STDLIB_INTERFACE attribute where necessary

Browse Source 
... and remove some redundant ones.

This change fixes the RuntimeObjC.swift test.

rdar://problem/26239602
This commit is contained in:
Dmitri Gribenko
2016-05-12 13:25:50 -07:00
parent 6105438ae3
commit 09f7245dbf
6 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stdlib/public/SwiftShims/CoreFoundationShims.h
+11
View File
@@ -20,6 +20,7 @@
#define SWIFT_STDLIB_SHIMS_COREFOUNDATIONSHIMS_H
#include "SwiftStdint.h"
#include "Visibility.h"
#ifdef __cplusplus
namespace swift { extern "C" {
@@ -54,37 +55,46 @@ typedef unsigned char _swift_shims_Boolean;
typedef __swift_uint16_t _swift_shims_UniChar;
// Buffer is nullable in case the string is zero-length.
SWIFT_RUNTIME_STDLIB_INTERFACE
void _swift_stdlib_CFStringGetCharacters(_swift_shims_CFStringRef __nonnull theString,
_swift_shims_CFRange range,
_swift_shims_UniChar *__nullable buffer);
SWIFT_RUNTIME_STDLIB_INTERFACE
const _swift_shims_UniChar *__nullable _swift_stdlib_CFStringGetCharactersPtr(
_swift_shims_CFStringRef __nonnull theString);
SWIFT_RUNTIME_STDLIB_INTERFACE
_swift_shims_CFIndex
_swift_stdlib_CFStringGetLength(_swift_shims_CFStringRef __nonnull theString);
SWIFT_RUNTIME_STDLIB_INTERFACE
_swift_shims_CFStringRef __nonnull _swift_stdlib_CFStringCreateWithSubstring(
_swift_shims_CFAllocatorRef __nullable alloc,
_swift_shims_CFStringRef __nonnull str, _swift_shims_CFRange range);
SWIFT_RUNTIME_STDLIB_INTERFACE
_swift_shims_UniChar
_swift_stdlib_CFStringGetCharacterAtIndex(_swift_shims_CFStringRef __nonnull theString,
_swift_shims_CFIndex idx);
SWIFT_RUNTIME_STDLIB_INTERFACE
_swift_shims_CFStringRef __nonnull _swift_stdlib_CFStringCreateCopy(
_swift_shims_CFAllocatorRef __nullable alloc,
_swift_shims_CFStringRef __nonnull theString);
SWIFT_RUNTIME_STDLIB_INTERFACE
const char *__nullable _swift_stdlib_CFStringGetCStringPtr(
_swift_shims_CFStringRef __nonnull theString,
_swift_shims_CFStringEncoding encoding);
SWIFT_RUNTIME_STDLIB_INTERFACE
_swift_shims_CFComparisonResult
_swift_stdlib_CFStringCompare(_swift_shims_CFStringRef __nonnull theString1,
_swift_shims_CFStringRef __nonnull theString2,
_swift_shims_CFStringCompareFlags compareOptions);
SWIFT_RUNTIME_STDLIB_INTERFACE
_swift_shims_Boolean
_swift_stdlib_CFStringFindWithOptions(_swift_shims_CFStringRef __nonnull theString,
_swift_shims_CFStringRef __nonnull stringToFind,
@@ -92,6 +102,7 @@ _swift_stdlib_CFStringFindWithOptions(_swift_shims_CFStringRef __nonnull theStri
_swift_shims_CFStringCompareFlags searchOptions,
_swift_shims_CFRange *__nullable result);
SWIFT_RUNTIME_STDLIB_INTERFACE
_swift_shims_CFStringRef __nonnull _swift_stdlib_objcDebugDescription(id __nonnull nsObject);
#endif // __OBJC2__
stdlib/public/SwiftShims/FoundationShims.h
+9
View File
@@ -29,6 +29,10 @@
#include "SwiftStdint.h"
#ifdef __cplusplus
namespace swift { extern "C" {
#endif
typedef struct {
__swift_intptr_t location;
__swift_intptr_t length;
@@ -50,7 +54,12 @@ typedef struct {
__swift_intptr_t patchVersion;
} _SwiftNSOperatingSystemVersion;
SWIFT_RUNTIME_STDLIB_INTERFACE
_SwiftNSOperatingSystemVersion _swift_stdlib_operatingSystemVersion();
#ifdef __cplusplus
}} // extern "C", namespace swift
#endif
#endif // SWIFT_STDLIB_SHIMS_FOUNDATIONSHIMS_H
stdlib/public/SwiftShims/HeapObject.h
+2 -2
View File
@@ -60,7 +60,7 @@ static_assert(swift::IsTriviallyConstructible<HeapObject>::value,
static_assert(std::is_trivially_destructible<HeapObject>::value,
"HeapObject must be trivially destructible");
}
#endif
} // end namespace swift
#endif
#endif
stdlib/public/stubs/Availability.mm
+3 -3
View File
@@ -17,6 +17,7 @@
#include "swift/Runtime/Debug.h"
#import <Foundation/Foundation.h>
#include <TargetConditionals.h>
#include "../SwiftShims/FoundationShims.h"
using namespace swift;
@@ -74,8 +75,7 @@ static NSOperatingSystemVersion operatingSystemVersionFromPlist() {
/// Return the version of the operating system currently running for use in
/// API availability queries.
SWIFT_RUNTIME_STDLIB_INTERFACE
extern "C" NSOperatingSystemVersion _swift_stdlib_operatingSystemVersion() {
_SwiftNSOperatingSystemVersion swift::_swift_stdlib_operatingSystemVersion() {
static NSOperatingSystemVersion version = ([]{
// Use -[NSProcessInfo.operatingSystemVersion] when present
// (on iOS 8 and OS X 10.10 and above).
@@ -88,5 +88,5 @@ extern "C" NSOperatingSystemVersion _swift_stdlib_operatingSystemVersion() {
}
})();
return version;
return { version.majorVersion, version.minorVersion, version.patchVersion };
}
stdlib/public/stubs/GlobalObjects.cpp
+6 -11
View File
@@ -15,17 +15,18 @@
// defined here.
//
//===----------------------------------------------------------------------===//
#include "../SwiftShims/GlobalObjects.h"
#include "swift/Runtime/Metadata.h"
namespace swift {
// FIXME(ABI): does this declaration need SWIFT_RUNTIME_STDLIB_INTERFACE?
// _direct type metadata for Swift._EmptyArrayStorage
SWIFT_RUNTIME_STDLIB_INTERFACE
extern "C" ClassMetadata _TMCs18_EmptyArrayStorage;
}
SWIFT_RUNTIME_STDLIB_INTERFACE
extern "C" _SwiftEmptyArrayStorage _swiftEmptyArrayStorage = {
swift::_SwiftEmptyArrayStorage swift::_swiftEmptyArrayStorage = {
// HeapObject header;
{
&_TMCs18_EmptyArrayStorage, // isa pointer
@@ -38,16 +39,10 @@ extern "C" _SwiftEmptyArrayStorage _swiftEmptyArrayStorage = {
}
};
SWIFT_RUNTIME_STDLIB_INTERFACE
extern "C"
__swift_uint64_t _swift_stdlib_HashingDetail_fixedSeedOverride = 0;
__swift_uint64_t swift::_swift_stdlib_HashingDetail_fixedSeedOverride = 0;
/// Backing storage for Swift.Process.arguments.
SWIFT_RUNTIME_STDLIB_INTERFACE
extern "C"
void *_swift_stdlib_ProcessArguments = nullptr;
}
void *swift::_swift_stdlib_ProcessArguments = nullptr;
namespace llvm { namespace hashing { namespace detail {
// An extern variable expected by LLVM's hashing templates. We don't link any
test/1_stdlib/RuntimeObjC.swift
-6
View File
@@ -682,11 +682,6 @@ RuntimeFoundationWrappers.test("_stdlib_NSStringUppercaseString/NoLeak") {
expectEqual(0, nsStringCanaryCount)
}
// FIXME: Temporarily commented out due to linker failure in finding
// __swift_stdlib_CFStringCreateCopy, __swift_stdlib_CFStringGetCharactersPtr,
// and __swift_stdlib_CFStringGetLength during optimized builds.
// rdar://problem/26239602
/*
RuntimeFoundationWrappers.test("_stdlib_CFStringCreateCopy/NoLeak") {
nsStringCanaryCount = 0
autoreleasepool {
@@ -716,7 +711,6 @@ RuntimeFoundationWrappers.test("_stdlib_CFStringGetCharactersPtr/NoLeak") {
}
expectEqual(0, nsStringCanaryCount)
}
*/
RuntimeFoundationWrappers.test("bridgedNSArray") {
var c = [NSObject]()