https://github.com/Mr-Anyone created
https://github.com/llvm/llvm-project/pull/152082
Forward SourceLocation to `EmitCall` so that clang triggers an error when a
function inside `[[gnu::cleanup(func)]]` is annotated with `[[gnu::error("some
message")]]`.
resolves #146520
>From c0fda068d6a17845593702ea6198ad458bec217d Mon Sep 17 00:00:00 2001
From: Vincent <l...@viceroygroup.ca>
Date: Tue, 5 Aug 2025 13:39:02 +0800
Subject: [PATCH] [clang] Emit Error for Cleanup Attribute Functions Marked
with Error Attribute
Forward SourceLocation to `EmitCall` so that clang triggers an error when
a function inside [[gnu::cleanup(func)]] is annotated with
[[gnu::error("...")]].
resolves #146520
---
clang/docs/ReleaseNotes.rst | 2 ++
clang/lib/CodeGen/CGDecl.cpp | 11 +++++++++--
.../backend-attribute-error-warning-optimize.c | 10 ++++++++++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 9231f2cae9bfa..4fc354e254e38 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -152,6 +152,8 @@ Bug Fixes to Attribute Support
- ``[[nodiscard]]`` is now respected on Objective-C and Objective-C++ methods.
(#GH141504)
+- Using ``[[gnu::cleanup(some_func)]]`` where some_func is annotated with
+ ``[[gnu::error("some error")]]`` now correctly triggers an error. (#GH146520)
Bug Fixes to C++ Support
^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp
index 04f13c7d7a6a3..8f1d1fac3f083 100644
--- a/clang/lib/CodeGen/CGDecl.cpp
+++ b/clang/lib/CodeGen/CGDecl.cpp
@@ -624,8 +624,15 @@ namespace {
CallArgList Args;
Args.add(RValue::get(Arg),
CGF.getContext().getPointerType(Var.getType()));
- auto Callee = CGCallee::forDirect(CleanupFn);
- CGF.EmitCall(FnInfo, Callee, ReturnValueSlot(), Args);
+ bool HasCleanupAttr = Var.hasAttr<CleanupAttr>();
+ GlobalDecl GD = HasCleanupAttr
+ ? (Var.getAttr<CleanupAttr>()->getFunctionDecl())
+ : GlobalDecl();
+ SourceLocation Loc = HasCleanupAttr ?
Var.getAttr<CleanupAttr>()->getLoc()
+ : SourceLocation();
+ auto Callee = CGCallee::forDirect(CleanupFn, CGCalleeInfo(GD));
+ CGF.EmitCall(FnInfo, Callee, ReturnValueSlot(), Args,
+ /*callOrInvoke*/ nullptr, /*IsMustTail*/ false, Loc);
}
};
} // end anonymous namespace
diff --git a/clang/test/Frontend/backend-attribute-error-warning-optimize.c
b/clang/test/Frontend/backend-attribute-error-warning-optimize.c
index d3951e3b6b1f5..d5a8d57e36c96 100644
--- a/clang/test/Frontend/backend-attribute-error-warning-optimize.c
+++ b/clang/test/Frontend/backend-attribute-error-warning-optimize.c
@@ -20,3 +20,13 @@ void indirect(void) {
quux = foo;
quux();
}
+
+// https://github.com/llvm/llvm-project/issues/146520
+
+[[gnu::error("error please")]]
+void cleaner_function(char*);
+
+void asdf(void){
+ [[gnu::cleanup(cleaner_function)]] // expected-error {{call to
'cleaner_function' declared with 'error' attribute: error please}}
+ char x;
+}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
