Skip to content

Commit 17fa8b9

Browse files
authored
Merge pull request #81946 from tshortli/warnings
Fix various warnings
2 parents 75b3fdd + 1434128 commit 17fa8b9

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

lib/AST/Availability.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ bool AvailabilityInference::updateBeforeAvailabilityDomainForFallback(
373373
auto potentiallyRemappedIntroducedVersion =
374374
getRemappedIntroducedVersionForFallbackPlatform(ctx, beforeVersion);
375375
if (potentiallyRemappedIntroducedVersion.has_value()) {
376-
domain = AvailabilityDomain::forPlatform(PlatformKind::visionOS);
376+
domain = remappedDomain;
377377
platformVer = potentiallyRemappedIntroducedVersion.value();
378378
return true;
379379
}

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1877,19 +1877,19 @@ extension ASTGenVisitor {
18771877
/// ```
18781878
func generateSpecializedAttr(attribute node: AttributeSyntax, attrName: SyntaxText) -> BridgedSpecializedAttr? {
18791879
guard
1880-
var arg = node.arguments?.as(SpecializedAttributeArgumentSyntax.self)
1880+
let arg = node.arguments?.as(SpecializedAttributeArgumentSyntax.self)
18811881
else {
18821882
// TODO: Diagnose
18831883
return nil
18841884
}
1885-
var exported: Bool?
1886-
var kind: BridgedSpecializationKind? = nil
1885+
let exported: Bool? = nil
1886+
let kind: BridgedSpecializationKind? = nil
18871887
var whereClause: BridgedTrailingWhereClause? = nil
1888-
var targetFunction: BridgedDeclNameRef? = nil
1889-
var spiGroups: [BridgedIdentifier] = []
1890-
var availableAttrs: [BridgedAvailableAttr] = []
1888+
let targetFunction: BridgedDeclNameRef? = nil
1889+
let spiGroups: [BridgedIdentifier] = []
1890+
let availableAttrs: [BridgedAvailableAttr] = []
18911891

1892-
whereClause = self.generate(genericWhereClause: arg.genericWhereClause)
1892+
whereClause = self.generate(genericWhereClause: arg.genericWhereClause)
18931893

18941894
return .createParsed(
18951895
self.ctx,
@@ -1925,7 +1925,7 @@ extension ASTGenVisitor {
19251925
while let arg = args.popFirst() {
19261926
switch arg {
19271927
case .genericWhereClause(let arg):
1928-
whereClause = self.generate(genericWhereClause: arg)
1928+
whereClause = self.generate(genericWhereClause: arg)
19291929
case .specializeTargetFunctionArgument(let arg):
19301930
if targetFunction != nil {
19311931
// TODO: Diangose.

lib/Parse/ParseDecl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ bool Parser::parseSpecializeAttributeArguments(
731731
if (Tok.is(tok::kw_where)) {
732732
SourceLoc whereLoc, endLoc;
733733
SmallVector<RequirementRepr, 4> requirements;
734-
auto status = parseGenericWhereClause(whereLoc, endLoc, requirements,
734+
parseGenericWhereClause(whereLoc, endLoc, requirements,
735735
/* AllowLayoutConstraints */ !isPublic);
736736
TrailingWhereClause =
737737
TrailingWhereClause::create(Context, whereLoc, endLoc, requirements);

0 commit comments

Comments
 (0)