[clang] nonblocking/nonallocating attributes (was: nolock/noalloc) (PR #84983)

Doug Wyatt via cfe-commits cfe-commits at lists.llvm.org
Mon May 27 10:35:29 PDT 2024


================
@@ -7525,25 +7525,21 @@ static Attr *getCCTypeAttr(ASTContext &Ctx, ParsedAttr &Attr) {
 
 std::optional<FunctionEffectMode>
 Sema::ActOnEffectExpression(Expr *CondExpr, StringRef AttributeName) {
-  auto BadExpr = [&]() {
-    Diag(CondExpr->getExprLoc(), diag::err_attribute_argument_type)
-        << ("'" + AttributeName.str() + "'") << AANT_ArgumentIntegerConstant
-        << CondExpr->getSourceRange();
+  if (DiagnoseUnexpandedParameterPack(CondExpr))
     return std::nullopt;
-  };
-
-  if (CondExpr->isTypeDependent() || CondExpr->isValueDependent()) {
-    if (CondExpr->containsUnexpandedParameterPack())
-      return BadExpr();
+  if (CondExpr->isTypeDependent() || CondExpr->isValueDependent())
     return FunctionEffectMode::Dependent;
-  }
 
   std::optional<llvm::APSInt> ConditionValue =
       CondExpr->getIntegerConstantExpr(Context);
-  if (!ConditionValue)
-    return BadExpr();
-  return ConditionValue->getExtValue() ? FunctionEffectMode::True
-                                       : FunctionEffectMode::False;
+  if (!ConditionValue) {
+    Diag(CondExpr->getExprLoc(), diag::err_attribute_argument_type)
+        << ("'" + AttributeName.str() + "'") << AANT_ArgumentIntegerConstant
----------------
dougsonos wrote:

I did that, with a FIXME about the inconsistency of that diagnostic.

https://github.com/llvm/llvm-project/pull/84983


More information about the cfe-commits mailing list