================
@@ -2316,6 +2337,49 @@ void BuildLockset::VisitReturnStmt(const ReturnStmt *S) {
ReturnType->getPointeeType().isConstQualified() ? AK_Read : AK_Written,
POK_ReturnPointer);
}
+
+ if (!checkRecordTypeForScopedCapability(ReturnType))
+ return;
+
+ if (const auto *CBTE = dyn_cast<ExprWithCleanups>(RetVal))
+ RetVal = CBTE->getSubExpr();
+ RetVal = RetVal->IgnoreCasts();
+ if (const auto *CBTE = dyn_cast<CXXBindTemporaryExpr>(RetVal))
+ RetVal = CBTE->getSubExpr();
+ CapabilityExpr Cp;
+ if (auto Object = Analyzer->ConstructedObjects.find(RetVal);
+ Object != Analyzer->ConstructedObjects.end()) {
+ Cp = CapabilityExpr(Object->second, StringRef(), false);
+ Analyzer->ConstructedObjects.erase(Object);
+ }
+ if (!Cp.shouldIgnore()) {
+ const FactEntry *Fact = FSet.findLock(Analyzer->FactMan, Cp);
+ if (const ScopedLockableFactEntry *Scope =
+ cast_or_null<ScopedLockableFactEntry>(Fact)) {
+ CapExprSet LocksInReturnVal = Scope->getUnderlyingMutexes();
+ for (const auto &[a, b] : zip_longest(
+ Analyzer->ExpectedReturnedCapabilities, LocksInReturnVal)) {
+ if (!a.has_value()) {
+ Analyzer->Handler.handleExpectFewerUnderlyingMutexes(
+ RetVal->getExprLoc(), Analyzer->CurrentFunction->getLocation(),
+ Scope->toString(), b.value().getKind(), b.value().toString(),
----------------
aaronpuchert wrote:
I guess we can use the unchecked variants here:
```suggestion
Scope->toString(), b->getKind(), b->toString(),
```
Same below.
https://github.com/llvm/llvm-project/pull/131831
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
