sgatev created this revision.
sgatev added reviewers: ymandel, xazax.hun, gribozavr2.
Herald added subscribers: tschuett, steakhal, rnkovacs.
Herald added a project: All.
sgatev requested review of this revision.
Herald added a project: clang.
Model calls returning optionals
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D126759
Files:
clang/lib/Analysis/FlowSensitive/Models/UncheckedOptionalAccessModel.cpp
clang/unittests/Analysis/FlowSensitive/UncheckedOptionalAccessModelTest.cpp
Index: clang/unittests/Analysis/FlowSensitive/UncheckedOptionalAccessModelTest.cpp
===================================================================
--- clang/unittests/Analysis/FlowSensitive/UncheckedOptionalAccessModelTest.cpp
+++ clang/unittests/Analysis/FlowSensitive/UncheckedOptionalAccessModelTest.cpp
@@ -2150,6 +2150,70 @@
UnorderedElementsAre(Pair("check-1", "safe"), Pair("check-2", "safe")));
}
+TEST_P(UncheckedOptionalAccessTest, CallReturningOptional) {
+ ExpectLatticeChecksFor(
+ R"(
+ #include "unchecked_optional_access_test.h"
+
+ $ns::$optional<int> MakeOpt();
+
+ void target() {
+ $ns::$optional<int> opt = 0;
+ opt = MakeOpt();
+ opt.value();
+ /*[[check-1]]*/
+ }
+ )",
+ UnorderedElementsAre(Pair("check-1", "unsafe: input.cc:9:7")));
+
+ ExpectLatticeChecksFor(
+ R"(
+ #include "unchecked_optional_access_test.h"
+
+ const $ns::$optional<int>& MakeOpt();
+
+ void target() {
+ $ns::$optional<int> opt = 0;
+ opt = MakeOpt();
+ opt.value();
+ /*[[check-2]]*/
+ }
+ )",
+ UnorderedElementsAre(Pair("check-2", "unsafe: input.cc:9:7")));
+
+ ExpectLatticeChecksFor(
+ R"(
+ #include "unchecked_optional_access_test.h"
+
+ using IntOpt = $ns::$optional<int>;
+ IntOpt MakeOpt();
+
+ void target() {
+ IntOpt opt = 0;
+ opt = MakeOpt();
+ opt.value();
+ /*[[check-3]]*/
+ }
+ )",
+ UnorderedElementsAre(Pair("check-3", "unsafe: input.cc:10:7")));
+
+ ExpectLatticeChecksFor(
+ R"(
+ #include "unchecked_optional_access_test.h"
+
+ using IntOpt = $ns::$optional<int>;
+ const IntOpt& MakeOpt();
+
+ void target() {
+ IntOpt opt = 0;
+ opt = MakeOpt();
+ opt.value();
+ /*[[check-4]]*/
+ }
+ )",
+ UnorderedElementsAre(Pair("check-4", "unsafe: input.cc:10:7")));
+}
+
// FIXME: Add support for:
// - constructors (copy, move)
// - assignment operators (default, copy, move)
Index: clang/lib/Analysis/FlowSensitive/Models/UncheckedOptionalAccessModel.cpp
===================================================================
--- clang/lib/Analysis/FlowSensitive/Models/UncheckedOptionalAccessModel.cpp
+++ clang/lib/Analysis/FlowSensitive/Models/UncheckedOptionalAccessModel.cpp
@@ -158,6 +158,21 @@
ComparesToSame(integerLiteral(equals(0)))));
}
+auto possiblyAliasedOptionalType() {
+ return hasUnqualifiedDesugaredType(
+ recordType(hasDeclaration(optionalClass())));
+}
+
+auto possiblyAliasedOrReferencedOptionalType() {
+ return anyOf(possiblyAliasedOptionalType(),
+ referenceType(pointee(possiblyAliasedOptionalType())));
+}
+
+auto isCallReturningOptional() {
+ return callExpr(
+ callee(functionDecl(returns(possiblyAliasedOrReferencedOptionalType()))));
+}
+
/// Creates a symbolic value for an `optional` value using `HasValueVal` as the
/// symbolic value of its "has_value" property.
StructValue &createOptionalValue(Environment &Env, BoolValue &HasValueVal) {
@@ -320,6 +335,18 @@
});
}
+void transferCallReturningOptional(const CallExpr *E,
+ const MatchFinder::MatchResult &Result,
+ LatticeTransferState &State) {
+ if (State.Env.getStorageLocation(*E, SkipPast::None) != nullptr)
+ return;
+
+ auto &Loc = State.Env.createStorageLocation(*E);
+ State.Env.setStorageLocation(*E, Loc);
+ State.Env.setValue(
+ Loc, createOptionalValue(State.Env, State.Env.makeAtomicBoolValue()));
+}
+
void assignOptionalValue(const Expr &E, LatticeTransferState &State,
BoolValue &HasValueVal) {
if (auto *OptionalLoc =
@@ -545,6 +572,10 @@
// opt.value_or(X) != X
.CaseOf<Expr>(isValueOrNotEqX(), transferValueOrNotEqX)
+ // returns optional
+ .CaseOf<CallExpr>(isCallReturningOptional(),
+ transferCallReturningOptional)
+
.Build();
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
