averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Normalize version tuples in availability attributes coming from clang to use "."

Browse Source 
Seen as @available attributes being printed with "_" in interface
generation, but fixing it in the importer means they can't leak into
anywhere else.

rdar://problem/30451293
This commit is contained in:
Ben Langmuir
2017-09-01 16:20:54 -07:00
parent 0d2f8f2aac
commit f1c48daf70
5 changed files with 74 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ClangImporter/ImportDecl.cpp
View File

@@ -7029,7 +7029,8 @@ void ClangImporter::Implementation::importAttributes(
StringRef message = avail->getMessage();
const auto &deprecated = avail->getDeprecated();
clang::VersionTuple deprecated = avail->getDeprecated();
if (!deprecated.empty()) {
if (platformAvailability.deprecatedAsUnavailableFilter &&
platformAvailability.deprecatedAsUnavailableFilter(
@@ -7041,8 +7042,14 @@ void ClangImporter::Implementation::importAttributes(
}
}
const auto &obsoleted = avail->getObsoleted();
const auto &introduced = avail->getIntroduced();
clang::VersionTuple obsoleted = avail->getObsoleted();
clang::VersionTuple introduced = avail->getIntroduced();
// Swift only allows "." separators.
obsoleted.UseDotAsSeparator();
introduced.UseDotAsSeparator();
deprecated.UseDotAsSeparator();
const auto &replacement = avail->getReplacement();
StringRef swiftReplacement = "";

7
test/IDE/Inputs/print_clang_header/header-to-print.h
View File

@@ -32,3 +32,10 @@ struct Arkham;
@protocol Soul;
typedef struct __attribute__((objc_bridge(id))) __MyLittleCFType *MyLittleCFType;
@interface MaybeAvailable
-(void)method1 __attribute__((availability(macosx, introduced=10.1)));
-(void)method2 __attribute__((availability(macosx, introduced=10_1)));
-(void)method3 __attribute__((availability(macosx, deprecated=10_10)));
-(void)method4 __attribute__((availability(macosx, introduced=10_1, deprecated=10_10, obsoleted=10_11)));
@end

19
test/IDE/Inputs/print_clang_header/header-to-print.h.command-line-include.printed.txt
View File

@@ -28,3 +28,22 @@ protocol Superproto {
class MyLittleCFType {
}
class MaybeAvailable {
@available(OSX 10.1, *)
class func method1()
@available(OSX 10.1, *)
func method1()
@available(OSX 10.1, *)
class func method2()
@available(OSX 10.1, *)
func method2()
@available(OSX, deprecated: 10.10)
class func method3()
@available(OSX, deprecated: 10.10)
func method3()
@available(OSX, introduced: 10.1, deprecated: 10.10, obsoleted: 10.11)
class func method4()
@available(OSX, introduced: 10.1, deprecated: 10.10, obsoleted: 10.11)
func method4()
}

19
test/IDE/Inputs/print_clang_header/header-to-print.h.module.printed.txt
View File

@@ -25,3 +25,22 @@ protocol Superproto {
class MyLittleCFType : _CFObject {
}
class MaybeAvailable {
@available(OSX 10.1, *)
class func method1()
@available(OSX 10.1, *)
func method1()
@available(OSX 10.1, *)
class func method2()
@available(OSX 10.1, *)
func method2()
@available(OSX, deprecated: 10.10)
class func method3()
@available(OSX, deprecated: 10.10)
func method3()
@available(OSX, introduced: 10.1, deprecated: 10.10, obsoleted: 10.11)
class func method4()
@available(OSX, introduced: 10.1, deprecated: 10.10, obsoleted: 10.11)
func method4()
}

19
test/IDE/Inputs/print_clang_header/header-to-print.h.printed.txt
View File

@@ -28,3 +28,22 @@ protocol Superproto {
class MyLittleCFType : _CFObject {
}
class MaybeAvailable {
@available(OSX 10.1, *)
class func method1()
@available(OSX 10.1, *)
func method1()
@available(OSX 10.1, *)
class func method2()
@available(OSX 10.1, *)
func method2()
@available(OSX, deprecated: 10.10)
class func method3()
@available(OSX, deprecated: 10.10)
func method3()
@available(OSX, introduced: 10.1, deprecated: 10.10, obsoleted: 10.11)
class func method4()
@available(OSX, introduced: 10.1, deprecated: 10.10, obsoleted: 10.11)
func method4()
}