llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-clang
Author: Doug Wyatt (dougsonos)
<details>
<summary>Changes</summary>
In the following example, `Functor::method()` inappropriately triggers a
diagnostic that `outer()` is blocking by allocating memory.
```
void outer() [[clang::nonblocking]]
{
struct Functor {
int* ptr;
void method() { ptr = new int; }
};
```
---
Full diff: https://github.com/llvm/llvm-project/pull/166078.diff
2 Files Affected:
- (modified) clang/lib/Sema/SemaFunctionEffects.cpp (+8)
- (modified) clang/test/Sema/attr-nonblocking-constraints.cpp (+9)
``````````diff
diff --git a/clang/lib/Sema/SemaFunctionEffects.cpp
b/clang/lib/Sema/SemaFunctionEffects.cpp
index 8590ee831084f..7ae8d909aa337 100644
--- a/clang/lib/Sema/SemaFunctionEffects.cpp
+++ b/clang/lib/Sema/SemaFunctionEffects.cpp
@@ -1286,6 +1286,14 @@ class Analyzer {
return true;
}
+ bool TraverseCXXRecordDecl(CXXRecordDecl *D) override {
+ // Completely skip local struct/class/union declarations since their
+ // methods would otherwise be incorrectly interpreted as part of the
+ // function we are currently traversing. The initial Sema pass will have
+ // already recorded any nonblocking methods needing analysis.
+ return true;
+ }
+
bool TraverseConstructorInitializer(CXXCtorInitializer *Init) override {
ViolationSite PrevVS = VSite;
if (Init->isAnyMemberInitializer())
diff --git a/clang/test/Sema/attr-nonblocking-constraints.cpp
b/clang/test/Sema/attr-nonblocking-constraints.cpp
index b26a945843696..e75d2967e4927 100644
--- a/clang/test/Sema/attr-nonblocking-constraints.cpp
+++ b/clang/test/Sema/attr-nonblocking-constraints.cpp
@@ -104,6 +104,15 @@ void nb8c()
};
}
+void nb8d() [[clang::nonblocking]]
+{
+ // Blocking methods of a local CXXRecordDecl do not generate diagnostics
+ // for the outer function.
+ struct Functor1 {
+ void method() { void* ptr = new int; }
+ };
+}
+
// Make sure template expansions are found and verified.
template <typename T>
struct Adder {
``````````
</details>
https://github.com/llvm/llvm-project/pull/166078
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
