github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code.
:warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff origin/main HEAD --extensions h,c,cpp --
clang/test/Sema/attr-availability-zippered.c clang/include/clang/AST/DeclBase.h
clang/include/clang/AST/ExprObjC.h clang/include/clang/Basic/TargetInfo.h
clang/include/clang/Sema/DelayedDiagnostic.h clang/include/clang/Sema/Sema.h
clang/lib/AST/DeclBase.cpp clang/lib/Basic/Targets/ARM.cpp
clang/lib/Basic/Targets/OSTargets.cpp clang/lib/Basic/Targets/OSTargets.h
clang/lib/CodeGen/CGExprScalar.cpp clang/lib/CodeGen/CGObjC.cpp
clang/lib/CodeGen/CodeGenFunction.h clang/lib/CodeGen/CodeGenModule.h
clang/lib/Edit/RewriteObjCFoundationAPI.cpp
clang/lib/Sema/CodeCompleteConsumer.cpp clang/lib/Sema/DelayedDiagnostic.cpp
clang/lib/Sema/SemaAvailability.cpp clang/lib/Sema/SemaDecl.cpp
clang/lib/Sema/SemaDeclAttr.cpp clang/lib/Sema/SemaDeclObjC.cpp
clang/lib/Sema/SemaExpr.cpp clang/lib/Sema/SemaExprObjC.cpp
clang/lib/Sema/SemaLookup.cpp clang/lib/Sema/SemaObjCProperty.cpp
clang/lib/Sema/SemaTemplateInstantiate.cpp
clang/lib/Serialization/ASTReaderStmt.cpp
clang/lib/Serialization/ASTWriterStmt.cpp clang/tools/libclang/CIndex.cpp
--diff_from_common_commit
``````````
:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/clang/include/clang/AST/DeclBase.h
b/clang/include/clang/AST/DeclBase.h
index bab327345..2cf8a792c 100644
--- a/clang/include/clang/AST/DeclBase.h
+++ b/clang/include/clang/AST/DeclBase.h
@@ -760,10 +760,10 @@ public:
/// Determine the availability of the given declaration for the given
/// target platform and its minimum version.
- AvailabilityResult getAvailability(StringRef Platform,
- const VersionTuple &PlatformMinVersion,
- std::string *Message = nullptr,
- StringRef *RealizedPlatform = nullptr)
const;
+ AvailabilityResult
+ getAvailability(StringRef Platform, const VersionTuple &PlatformMinVersion,
+ std::string *Message = nullptr,
+ StringRef *RealizedPlatform = nullptr) const;
/// Retrieve the version of the target platform in which this
/// declaration was introduced.
diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
index c7e4db0f4..42858681f 100644
--- a/clang/include/clang/Sema/Sema.h
+++ b/clang/include/clang/Sema/Sema.h
@@ -2466,9 +2466,10 @@ public:
void handleDelayedAvailabilityCheck(sema::DelayedDiagnostic &DD, Decl *Ctx);
- void handleZipperedDelayedAvailabilityCheck(
- sema::DelayedDiagnostic &DD, sema::DelayedDiagnostic &VariantDD,
- Decl *Ctx);
+ void
+ handleZipperedDelayedAvailabilityCheck(sema::DelayedDiagnostic &DD,
+ sema::DelayedDiagnostic &VariantDD,
+ Decl *Ctx);
/// Retrieve the current function, if any, that should be analyzed for
/// potential availability violations.
diff --git a/clang/lib/AST/DeclBase.cpp b/clang/lib/AST/DeclBase.cpp
index b8dd27729..aff04541c 100644
--- a/clang/lib/AST/DeclBase.cpp
+++ b/clang/lib/AST/DeclBase.cpp
@@ -791,7 +791,6 @@ AvailabilityResult Decl::getAvailability(StringRef Platform,
return FTD->getTemplatedDecl()->getAvailability(
Platform, PlatformMinVersion, Message, RealizedPlatform);
-
AvailabilityResult Result = AR_Available;
std::string ResultMessage;
diff --git a/clang/lib/Basic/Targets/OSTargets.h
b/clang/lib/Basic/Targets/OSTargets.h
index d5aa067d9..724406f82 100644
--- a/clang/lib/Basic/Targets/OSTargets.h
+++ b/clang/lib/Basic/Targets/OSTargets.h
@@ -198,7 +198,6 @@ public:
private:
std::string TargetVariantTriple;
-
};
// DragonFlyBSD Target
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp
b/clang/lib/CodeGen/CGExprScalar.cpp
index 5f46849cc..5be65e13a 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/lib/CodeGen/CGExprScalar.cpp
@@ -639,12 +639,13 @@ public:
// If we're checking for a platform older than our minimum deployment
// target, we can fold the check away.
- if ((Version.empty() && VariantVersion.empty()) || (!Version.empty() &&
- Version <= CGF.CGM.getTarget().getPlatformMinVersion() &&
- (!CGF.CGM.getTarget().hasTargetVariantPlatform() ||
- (!VariantVersion.empty() &&
- VariantVersion <=
- CGF.CGM.getTarget().getTargetVariantPlatformMinVersion()))))
+ if ((Version.empty() && VariantVersion.empty()) ||
+ (!Version.empty() &&
+ Version <= CGF.CGM.getTarget().getPlatformMinVersion() &&
+ (!CGF.CGM.getTarget().hasTargetVariantPlatform() ||
+ (!VariantVersion.empty() &&
+ VariantVersion <=
+ CGF.CGM.getTarget().getTargetVariantPlatformMinVersion()))))
return llvm::ConstantInt::get(Builder.getInt1Ty(), 1);
return CGF.EmitBuiltinAvailable(Version, VariantVersion);
diff --git a/clang/lib/Sema/SemaAvailability.cpp
b/clang/lib/Sema/SemaAvailability.cpp
index 6c7d1e17f..2c736015c 100644
--- a/clang/lib/Sema/SemaAvailability.cpp
+++ b/clang/lib/Sema/SemaAvailability.cpp
@@ -95,11 +95,10 @@ static const AvailabilityAttr
*getAttrForPlatform(ASTContext &Context,
/// \param ClassReceiver If we're checking the method of a class message
/// send, the class. Otherwise nullptr.
std::pair<AvailabilityResult, const NamedDecl *>
-Sema::ShouldDiagnoseAvailabilityOfDecl(const NamedDecl *D,
- StringRef Platform,
- const VersionTuple &PlatformVersion,
- std::string *Message,
- ObjCInterfaceDecl *ClassReceiver) {
+Sema::ShouldDiagnoseAvailabilityOfDecl(const NamedDecl *D, StringRef Platform,
+ const VersionTuple &PlatformVersion,
+ std::string *Message,
+ ObjCInterfaceDecl *ClassReceiver) {
AvailabilityResult Result =
D->getAvailability(Platform, PlatformVersion, Message);
@@ -239,7 +238,6 @@ static bool ShouldDiagnoseAvailabilityInContext(
return false;
};
-
do {
if (CheckContext(Ctx))
return false;
@@ -270,9 +268,10 @@ static unsigned getAvailabilityDiagnosticKind(
const ASTContext &Context, const VersionTuple &DeploymentVersion,
const VersionTuple &DeclVersion, bool HasMatchingEnv,
bool IsTargetVariantCheck = false) {
- const auto &Triple = IsTargetVariantCheck
- ?
*Context.getTargetInfo().getDarwinTargetVariantTriple()
- : Context.getTargetInfo().getTriple();
+ const auto &Triple =
+ IsTargetVariantCheck
+ ? *Context.getTargetInfo().getDarwinTargetVariantTriple()
+ : Context.getTargetInfo().getTriple();
VersionTuple ForceAvailabilityFromVersion;
switch (Triple.getOS()) {
// For iOS, emit the diagnostic even if -Wunguarded-availability is
@@ -600,8 +599,7 @@ static void EmitNotIntroducedAvailabilityWarning(
if (!Insertion)
return;
- auto GetAvailablePlatform =
- [&](StringRef PlatformName) -> StringRef {
+ auto GetAvailablePlatform = [&](StringRef PlatformName) -> StringRef {
// Apple's API_AVAILABLE macro expands roughly like this.
// API_AVAILABLE(ios(17.0))
// __attribute__((availability(__API_AVAILABLE_PLATFORM_ios(17.0)))
@@ -1063,7 +1061,9 @@ class DiagnoseUnguardedAvailability : public
DynamicRecursiveASTVisitor {
std::optional<VersionTuple> Version;
std::optional<VersionTuple> VariantVersion;
- static ZipperedVersionTuple make(VersionTuple V) { return {V,
std::nullopt}; }
+ static ZipperedVersionTuple make(VersionTuple V) {
+ return {V, std::nullopt};
+ }
static ZipperedVersionTuple makeVariant(VersionTuple V) {
return {std::nullopt, V};
}
@@ -1183,8 +1183,8 @@ void
DiagnoseUnguardedAvailability::EmitNotYetIntroducedDiagnostic(
std::string PlatformName(
AvailabilityAttr::getPrettyPlatformName(PlatformNameStrRef));
llvm::StringRef TargetEnvironment(TI.getTriple().getEnvironmentName());
- bool EnvironmentMatchesOrNone =
- hasMatchingEnvironmentOrNone(SemaRef.getASTContext(),
AA->getEffectiveAttr());
+ bool EnvironmentMatchesOrNone = hasMatchingEnvironmentOrNone(
+ SemaRef.getASTContext(), AA->getEffectiveAttr());
llvm::StringRef AttrEnvironment =
AA->getEnvironment() ? AA->getEnvironment()->getName() : "";
bool UseEnvironment =
@@ -1302,8 +1302,9 @@ void
DiagnoseUnguardedAvailability::EmitNotYetIntroducedDiagnostic(
<< (SemaRef.getLangOpts().ObjC ? "@available" :
"__builtin_available")
<< "(" << FixItPlatformName << " " << FixItVersion.getAsString();
if (VariantPlatformInfo)
- FixItOS << ", " << AvailabilityAttr::getPlatformNameSourceSpelling(
- TI.getTargetVariantPlatform())
+ FixItOS << ", "
+ << AvailabilityAttr::getPlatformNameSourceSpelling(
+ TI.getTargetVariantPlatform())
<< " " << VariantIntroduced.getAsString();
FixItOS << ", *)) {\n" << Indentation << ExtraIndentation;
FixitDiag << FixItHint::CreateInsertion(IfInsertionLoc, FixItOS.str());
@@ -1431,7 +1432,6 @@ ExtractedAvailabilityExpr extractAvailabilityExpr(const
Expr *IfCond) {
}
}
-
bool DiagnoseUnguardedAvailability::TraverseIfStmt(IfStmt *If) {
VersionTuple CondVersion;
VersionTuple VariantCondVersion;
@@ -1470,9 +1470,11 @@ bool
DiagnoseUnguardedAvailability::TraverseIfStmt(IfStmt *If) {
std::swap(Guarded, Unguarded);
}
AvailabilityStack.push_back(ZipperedVersionTuple{
- CondVersion.empty() ? std::nullopt :
std::optional<VersionTuple>(CondVersion),
- VariantCondVersion.empty() ? std::nullopt
- :
std::optional<VersionTuple>(VariantCondVersion)});
+ CondVersion.empty() ? std::nullopt
+ : std::optional<VersionTuple>(CondVersion),
+ VariantCondVersion.empty()
+ ? std::nullopt
+ : std::optional<VersionTuple>(VariantCondVersion)});
bool ShouldContinue = TraverseStmt(Guarded);
AvailabilityStack.pop_back();
``````````
</details>
https://github.com/llvm/llvm-project/pull/218843
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
