Skip to content

[pull] swiftwasm from main #1909

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 4 commits into from
Oct 4, 2020
Merged

[pull] swiftwasm from main #1909

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
4c30f8b
appendingPathComponent(:isDirectory:) should account for isDirectory
Coeur Apr 10, 2019
14e6772
Consider inherited platform unavailability to silence diagnostics
xymus Sep 23, 2020
6c72664
Merge pull request #34087 from xymus/inherit-unavailability
xymus Oct 4, 2020
c02dc72
Merge pull request #23926 from Coeur/patch-1
xwu Oct 4, 2020
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
5 changes: 4 additions & 1 deletion lib/Sema/TypeCheckAvailability.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,10 @@ static bool isInsideCompatibleUnavailableDeclaration(
auto IsUnavailable = [platform](const Decl *D) {
auto EnclosingUnavailable =
D->getAttrs().getUnavailable(D->getASTContext());
return EnclosingUnavailable && EnclosingUnavailable->Platform == platform;
return EnclosingUnavailable &&
(EnclosingUnavailable->Platform == platform ||
inheritsAvailabilityFromPlatform(platform,
EnclosingUnavailable->Platform));
};

return someEnclosingDeclMatches(ReferenceRange, ReferenceDC, IsUnavailable);
Expand Down
3 changes: 2 additions & 1 deletion stdlib/public/Darwin/Foundation/URL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,8 @@ public struct URL : ReferenceConvertible, Equatable {
} else {
// Now we need to do something more expensive
if var c = URLComponents(url: self, resolvingAgainstBaseURL: true) {
c.path = (c.path as NSString).appendingPathComponent(pathComponent)
let path = (c.path as NSString).appendingPathComponent(pathComponent)
c.path = isDirectory ? path + "/" : path

if let result = c.url {
return result
Expand Down
24 changes: 24 additions & 0 deletions test/attr/attr_availability_maccatalyst.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,27 @@ protocol P: Builtin.AnyObject {
}

extension X: P {}

// Test platform inheritance for iOS unavailability.
// rdar://68597591

@available(iOS, unavailable)
public struct UnavailableOniOS { } // expected-note 2 {{'UnavailableOniOS' has been explicitly marked unavailable here}}

@available(iOS, unavailable)
func unavailableOniOS(_ p: UnavailableOniOS) { } // ok

func functionUsingAnUnavailableType(_ p: UnavailableOniOS) { } // expected-error {{'UnavailableOniOS' is unavailable in iOS}}

public extension UnavailableOniOS { } // expected-error {{'UnavailableOniOS' is unavailable in iOS}}

@available(iOS, unavailable)
public extension UnavailableOniOS { // ok
func someMethod(_ p: UnavailableOniOS) { }
}

@available(iOS, unavailable)
@available(macCatalyst, introduced: 13.0)
public struct AvailableOnMacCatalyst { }

public extension AvailableOnMacCatalyst { } // ok