Skip to content

Commit 1c66691

Browse files
egorzhdanjansvoboda11
authored andcommitted
[Clang][Sema] Adjust formatting (NFC)
This is a preparation for another change in the watchOS/tvOS availability logic. It is extracted into a separate commit to simplify reviewing and to keep the linter happy at the same time. rdar://81491680 Reviewed By: aaron.ballman Differential Revision: https://reviews.llvm.org/D116459
1 parent 3235726 commit 1c66691

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

clang/lib/Sema/SemaDeclAttr.cpp

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2625,37 +2625,37 @@ static void handleAvailabilityAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
26252625
NewII = &S.Context.Idents.get("watchos_app_extension");
26262626

26272627
if (NewII) {
2628-
auto adjustWatchOSVersion = [](VersionTuple Version) -> VersionTuple {
2629-
if (Version.empty())
2630-
return Version;
2631-
auto Major = Version.getMajor();
2632-
auto NewMajor = Major >= 9 ? Major - 7 : 0;
2633-
if (NewMajor >= 2) {
2634-
if (Version.getMinor().hasValue()) {
2635-
if (Version.getSubminor().hasValue())
2636-
return VersionTuple(NewMajor, Version.getMinor().getValue(),
2637-
Version.getSubminor().getValue());
2638-
else
2639-
return VersionTuple(NewMajor, Version.getMinor().getValue());
2640-
}
2641-
return VersionTuple(NewMajor);
2628+
auto adjustWatchOSVersion = [](VersionTuple Version) -> VersionTuple {
2629+
if (Version.empty())
2630+
return Version;
2631+
auto Major = Version.getMajor();
2632+
auto NewMajor = Major >= 9 ? Major - 7 : 0;
2633+
if (NewMajor >= 2) {
2634+
if (Version.getMinor().hasValue()) {
2635+
if (Version.getSubminor().hasValue())
2636+
return VersionTuple(NewMajor, Version.getMinor().getValue(),
2637+
Version.getSubminor().getValue());
2638+
else
2639+
return VersionTuple(NewMajor, Version.getMinor().getValue());
26422640
}
2641+
return VersionTuple(NewMajor);
2642+
}
26432643

2644-
return VersionTuple(2, 0);
2645-
};
2644+
return VersionTuple(2, 0);
2645+
};
26462646

2647-
auto NewIntroduced = adjustWatchOSVersion(Introduced.Version);
2648-
auto NewDeprecated = adjustWatchOSVersion(Deprecated.Version);
2649-
auto NewObsoleted = adjustWatchOSVersion(Obsoleted.Version);
2650-
2651-
AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(
2652-
ND, AL, NewII, true /*Implicit*/, NewIntroduced, NewDeprecated,
2653-
NewObsoleted, IsUnavailable, Str, IsStrict, Replacement,
2654-
Sema::AMK_None,
2655-
PriorityModifier + Sema::AP_InferredFromOtherPlatform);
2656-
if (NewAttr)
2657-
D->addAttr(NewAttr);
2658-
}
2647+
auto NewIntroduced = adjustWatchOSVersion(Introduced.Version);
2648+
auto NewDeprecated = adjustWatchOSVersion(Deprecated.Version);
2649+
auto NewObsoleted = adjustWatchOSVersion(Obsoleted.Version);
2650+
2651+
AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(
2652+
ND, AL, NewII, true /*Implicit*/, NewIntroduced, NewDeprecated,
2653+
NewObsoleted, IsUnavailable, Str, IsStrict, Replacement,
2654+
Sema::AMK_None,
2655+
PriorityModifier + Sema::AP_InferredFromOtherPlatform);
2656+
if (NewAttr)
2657+
D->addAttr(NewAttr);
2658+
}
26592659
} else if (S.Context.getTargetInfo().getTriple().isTvOS()) {
26602660
// Transcribe "ios" to "tvos" (and add a new attribute) if the versioning
26612661
// matches before the start of the tvOS platform.
@@ -2673,7 +2673,7 @@ static void handleAvailabilityAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
26732673
PriorityModifier + Sema::AP_InferredFromOtherPlatform);
26742674
if (NewAttr)
26752675
D->addAttr(NewAttr);
2676-
}
2676+
}
26772677
} else if (S.Context.getTargetInfo().getTriple().getOS() ==
26782678
llvm::Triple::IOS &&
26792679
S.Context.getTargetInfo().getTriple().isMacCatalystEnvironment()) {

0 commit comments

Comments
 (0)