@@ -2625,37 +2625,37 @@ static void handleAvailabilityAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
2625
2625
NewII = &S.Context .Idents .get (" watchos_app_extension" );
2626
2626
2627
2627
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 ());
2642
2640
}
2641
+ return VersionTuple (NewMajor);
2642
+ }
2643
2643
2644
- return VersionTuple (2 , 0 );
2645
- };
2644
+ return VersionTuple (2 , 0 );
2645
+ };
2646
2646
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
+ }
2659
2659
} else if (S.Context .getTargetInfo ().getTriple ().isTvOS ()) {
2660
2660
// Transcribe "ios" to "tvos" (and add a new attribute) if the versioning
2661
2661
// matches before the start of the tvOS platform.
@@ -2673,7 +2673,7 @@ static void handleAvailabilityAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
2673
2673
PriorityModifier + Sema::AP_InferredFromOtherPlatform);
2674
2674
if (NewAttr)
2675
2675
D->addAttr (NewAttr);
2676
- }
2676
+ }
2677
2677
} else if (S.Context .getTargetInfo ().getTriple ().getOS () ==
2678
2678
llvm::Triple::IOS &&
2679
2679
S.Context .getTargetInfo ().getTriple ().isMacCatalystEnvironment ()) {
0 commit comments