[PATCH] D116459: [Clang][Sema] Adjust formatting (NFC)

[Jan Svoboda via Phabricator via cfe-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG1c66691ea770: [Clang][Sema] Adjust formatting (NFC) 
(authored by egorzhdan, committed by jansvoboda11).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D116459/new/

https://reviews.llvm.org/D116459

Files:
  clang/lib/Sema/SemaDeclAttr.cpp


Index: clang/lib/Sema/SemaDeclAttr.cpp
===
--- clang/lib/Sema/SemaDeclAttr.cpp
+++ clang/lib/Sema/SemaDeclAttr.cpp
@@ -2625,37 +2625,37 @@
   NewII = ("watchos_app_extension");
 
 if (NewII) {
-auto adjustWatchOSVersion = [](VersionTuple Version) -> VersionTuple {
-  if (Version.empty())
-return Version;
-  auto Major = Version.getMajor();
-  auto NewMajor = Major >= 9 ? Major - 7 : 0;
-  if (NewMajor >= 2) {
-if (Version.getMinor().hasValue()) {
-  if (Version.getSubminor().hasValue())
-return VersionTuple(NewMajor, Version.getMinor().getValue(),
-Version.getSubminor().getValue());
-  else
-return VersionTuple(NewMajor, Version.getMinor().getValue());
-}
-return VersionTuple(NewMajor);
+  auto adjustWatchOSVersion = [](VersionTuple Version) -> VersionTuple {
+if (Version.empty())
+  return Version;
+auto Major = Version.getMajor();
+auto NewMajor = Major >= 9 ? Major - 7 : 0;
+if (NewMajor >= 2) {
+  if (Version.getMinor().hasValue()) {
+if (Version.getSubminor().hasValue())
+  return VersionTuple(NewMajor, Version.getMinor().getValue(),
+  Version.getSubminor().getValue());
+else
+  return VersionTuple(NewMajor, Version.getMinor().getValue());
   }
+  return VersionTuple(NewMajor);
+}
 
-  return VersionTuple(2, 0);
-};
+return VersionTuple(2, 0);
+  };
 
-auto NewIntroduced = adjustWatchOSVersion(Introduced.Version);
-auto NewDeprecated = adjustWatchOSVersion(Deprecated.Version);
-auto NewObsoleted = adjustWatchOSVersion(Obsoleted.Version);
-
-AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(
-ND, AL, NewII, true /*Implicit*/, NewIntroduced, NewDeprecated,
-NewObsoleted, IsUnavailable, Str, IsStrict, Replacement,
-Sema::AMK_None,
-PriorityModifier + Sema::AP_InferredFromOtherPlatform);
-if (NewAttr)
-  D->addAttr(NewAttr);
-  }
+  auto NewIntroduced = adjustWatchOSVersion(Introduced.Version);
+  auto NewDeprecated = adjustWatchOSVersion(Deprecated.Version);
+  auto NewObsoleted = adjustWatchOSVersion(Obsoleted.Version);
+
+  AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(
+  ND, AL, NewII, true /*Implicit*/, NewIntroduced, NewDeprecated,
+  NewObsoleted, IsUnavailable, Str, IsStrict, Replacement,
+  Sema::AMK_None,
+  PriorityModifier + Sema::AP_InferredFromOtherPlatform);
+  if (NewAttr)
+D->addAttr(NewAttr);
+}
   } else if (S.Context.getTargetInfo().getTriple().isTvOS()) {
 // Transcribe "ios" to "tvos" (and add a new attribute) if the versioning
 // matches before the start of the tvOS platform.
@@ -2673,7 +2673,7 @@
   PriorityModifier + Sema::AP_InferredFromOtherPlatform);
   if (NewAttr)
 D->addAttr(NewAttr);
-  }
+}
   } else if (S.Context.getTargetInfo().getTriple().getOS() ==
  llvm::Triple::IOS &&
  S.Context.getTargetInfo().getTriple().isMacCatalystEnvironment()) 
{


Index: clang/lib/Sema/SemaDeclAttr.cpp
===
--- clang/lib/Sema/SemaDeclAttr.cpp
+++ clang/lib/Sema/SemaDeclAttr.cpp
@@ -2625,37 +2625,37 @@
   NewII = ("watchos_app_extension");
 
 if (NewII) {
-auto adjustWatchOSVersion = [](VersionTuple Version) -> VersionTuple {
-  if (Version.empty())
-return Version;
-  auto Major = Version.getMajor();
-  auto NewMajor = Major >= 9 ? Major - 7 : 0;
-  if (NewMajor >= 2) {
-if (Version.getMinor().hasValue()) {
-  if (Version.getSubminor().hasValue())
-return VersionTuple(NewMajor, Version.getMinor().getValue(),
-Version.getSubminor().getValue());
-  else
-return VersionTuple(NewMajor, Version.getMinor().getValue());
-}
-return VersionTuple(NewMajor);
+  auto adjustWatchOSVersion = [](VersionTuple Version) -> VersionTuple {
+if (Version.empty())
+  return Version;
+auto Major = Version.getMajor();
+auto NewMajor = Major 

[PATCH] D116459: [Clang][Sema] Adjust formatting (NFC)

[Aaron Ballman via Phabricator via cfe-commits]

aaron.ballman accepted this revision.
aaron.ballman added a comment.
This revision is now accepted and ready to land.

LGTM, thanks!


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D116459/new/

https://reviews.llvm.org/D116459

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D116459: [Clang][Sema] Adjust formatting (NFC)

[Egor Zhdan via Phabricator via cfe-commits]

egorzhdan created this revision.
Herald added a reviewer: aaron.ballman.
egorzhdan requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

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


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D116459

Files:
  clang/lib/Sema/SemaDeclAttr.cpp


Index: clang/lib/Sema/SemaDeclAttr.cpp
===
--- clang/lib/Sema/SemaDeclAttr.cpp
+++ clang/lib/Sema/SemaDeclAttr.cpp
@@ -2625,37 +2625,37 @@
   NewII = ("watchos_app_extension");
 
 if (NewII) {
-auto adjustWatchOSVersion = [](VersionTuple Version) -> VersionTuple {
-  if (Version.empty())
-return Version;
-  auto Major = Version.getMajor();
-  auto NewMajor = Major >= 9 ? Major - 7 : 0;
-  if (NewMajor >= 2) {
-if (Version.getMinor().hasValue()) {
-  if (Version.getSubminor().hasValue())
-return VersionTuple(NewMajor, Version.getMinor().getValue(),
-Version.getSubminor().getValue());
-  else
-return VersionTuple(NewMajor, Version.getMinor().getValue());
-}
-return VersionTuple(NewMajor);
+  auto adjustWatchOSVersion = [](VersionTuple Version) -> VersionTuple {
+if (Version.empty())
+  return Version;
+auto Major = Version.getMajor();
+auto NewMajor = Major >= 9 ? Major - 7 : 0;
+if (NewMajor >= 2) {
+  if (Version.getMinor().hasValue()) {
+if (Version.getSubminor().hasValue())
+  return VersionTuple(NewMajor, Version.getMinor().getValue(),
+  Version.getSubminor().getValue());
+else
+  return VersionTuple(NewMajor, Version.getMinor().getValue());
   }
+  return VersionTuple(NewMajor);
+}
 
-  return VersionTuple(2, 0);
-};
+return VersionTuple(2, 0);
+  };
 
-auto NewIntroduced = adjustWatchOSVersion(Introduced.Version);
-auto NewDeprecated = adjustWatchOSVersion(Deprecated.Version);
-auto NewObsoleted = adjustWatchOSVersion(Obsoleted.Version);
-
-AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(
-ND, AL, NewII, true /*Implicit*/, NewIntroduced, NewDeprecated,
-NewObsoleted, IsUnavailable, Str, IsStrict, Replacement,
-Sema::AMK_None,
-PriorityModifier + Sema::AP_InferredFromOtherPlatform);
-if (NewAttr)
-  D->addAttr(NewAttr);
-  }
+  auto NewIntroduced = adjustWatchOSVersion(Introduced.Version);
+  auto NewDeprecated = adjustWatchOSVersion(Deprecated.Version);
+  auto NewObsoleted = adjustWatchOSVersion(Obsoleted.Version);
+
+  AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(
+  ND, AL, NewII, true /*Implicit*/, NewIntroduced, NewDeprecated,
+  NewObsoleted, IsUnavailable, Str, IsStrict, Replacement,
+  Sema::AMK_None,
+  PriorityModifier + Sema::AP_InferredFromOtherPlatform);
+  if (NewAttr)
+D->addAttr(NewAttr);
+}
   } else if (S.Context.getTargetInfo().getTriple().isTvOS()) {
 // Transcribe "ios" to "tvos" (and add a new attribute) if the versioning
 // matches before the start of the tvOS platform.
@@ -2673,7 +2673,7 @@
   PriorityModifier + Sema::AP_InferredFromOtherPlatform);
   if (NewAttr)
 D->addAttr(NewAttr);
-  }
+}
   } else if (S.Context.getTargetInfo().getTriple().getOS() ==
  llvm::Triple::IOS &&
  S.Context.getTargetInfo().getTriple().isMacCatalystEnvironment()) 
{


Index: clang/lib/Sema/SemaDeclAttr.cpp
===
--- clang/lib/Sema/SemaDeclAttr.cpp
+++ clang/lib/Sema/SemaDeclAttr.cpp
@@ -2625,37 +2625,37 @@
   NewII = ("watchos_app_extension");
 
 if (NewII) {
-auto adjustWatchOSVersion = [](VersionTuple Version) -> VersionTuple {
-  if (Version.empty())
-return Version;
-  auto Major = Version.getMajor();
-  auto NewMajor = Major >= 9 ? Major - 7 : 0;
-  if (NewMajor >= 2) {
-if (Version.getMinor().hasValue()) {
-  if (Version.getSubminor().hasValue())
-return VersionTuple(NewMajor, Version.getMinor().getValue(),
-Version.getSubminor().getValue());
-  else
-return VersionTuple(NewMajor, Version.getMinor().getValue());
-}
-return VersionTuple(NewMajor);
+  auto adjustWatchOSVersion = [](VersionTuple Version) -> VersionTuple {
+if (Version.empty())
+  return