Skip to content

Fix out-of-bounds when providing fixits for the @available attribute. #64734

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 5 commits into from
Mar 31, 2023
Merged

Fix out-of-bounds when providing fixits for the @available attribute. #64734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62bb4ef
Fix out-of-bounds when providing fixits for the @available attribute.
tristanlabelle Mar 29, 2023
23d4c76
Added a regression test
tristanlabelle Mar 29, 2023
fe2ff68
EOL at EOF
tristanlabelle Mar 29, 2023
ae8150b
Fix error and not expectation
tristanlabelle Mar 30, 2023
f555154
Fixed expected location of note
tristanlabelle Mar 30, 2023
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: 3 additions & 6 deletions lib/Sema/TypeCheckAvailability.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2508,11 +2508,11 @@ static void fixItAvailableAttrRename(InFlightDiagnostic &diag,
auto I = argumentLabelIDs.begin();

auto updateLabelsForArg = [&](Expr *expr) -> bool {
if (I == argumentLabelIDs.end())
return true;

if (isa<DefaultArgumentExpr>(expr)) {
// Defaulted: remove param label of it.
if (I == argumentLabelIDs.end())
return true;

I = argumentLabelIDs.erase(I);
return false;
}
Expand All @@ -2539,9 +2539,6 @@ static void fixItAvailableAttrRename(InFlightDiagnostic &diag,
}

// Normal: Just advance.
if (I == argumentLabelIDs.end())
return true;

++I;
return false;
};
Expand Down
12 changes: 11 additions & 1 deletion test/attr/attr_availability_unavailability.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,14 @@ func testUnavailableExpandAllElsePaths() {
} else {
foo()
}
}
}

func log(message: String) {}

@available(*, unavailable, renamed: "log(message:)")
func log(format: String, _ args: Any...) { fatalError() } // expected-note {{'log(format:_:)' has been explicitly marked unavailable here}}

// Regression test for https://github.com/apple/swift/issues/64694
func testUnavailableRenamedFromVariadicDoesntAssert() {
log(format: "") // expected-error{{'log(format:_:)' has been renamed to 'log(message:)'}}
}