This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGcd0d52610d80: [clang][dataflow] In `optional` model, match
call return via hasType (authored by samestep, committed by ymandel).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D127434/new/
https://reviews.llvm.org/D127434
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
@@ -179,6 +179,11 @@
namespace detail {
+template <class T>
+auto try_add_lvalue_reference(int) -> type_identity<T&>;
+template <class T>
+auto try_add_lvalue_reference(...) -> type_identity<T>;
+
template <class T>
auto try_add_rvalue_reference(int) -> type_identity<T&&>;
template <class T>
@@ -186,6 +191,10 @@
} // namespace detail
+template <class T>
+struct add_lvalue_reference : decltype(detail::try_add_lvalue_reference<T>(0))
{
+};
+
template <class T>
struct add_rvalue_reference : decltype(detail::try_add_rvalue_reference<T>(0))
{
};
@@ -2318,6 +2327,26 @@
UnorderedElementsAre(Pair("merge", "unsafe: input.cc:19:7")));
}
+TEST_P(UncheckedOptionalAccessTest, AssignThroughLvalueReferencePtr) {
+ ExpectLatticeChecksFor(
+ R"(
+ #include "unchecked_optional_access_test.h"
+
+ template <typename T>
+ struct smart_ptr {
+ typename std::add_lvalue_reference<T>::type operator*() &;
+ };
+
+ void target() {
+ smart_ptr<$ns::$optional<float>> x;
+ *x = $ns::nullopt;
+ (*x).value();
+ /*[[check]]*/
+ }
+ )",
+ UnorderedElementsAre(Pair("check", "unsafe: input.cc:12: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
@@ -165,8 +165,8 @@
}
auto isCallReturningOptional() {
- return callExpr(callee(functionDecl(returns(anyOf(
- optionalOrAliasType(),
referenceType(pointee(optionalOrAliasType())))))));
+ return callExpr(hasType(qualType(anyOf(
+ optionalOrAliasType(), referenceType(pointee(optionalOrAliasType()))))));
}
/// Creates a symbolic value for an `optional` value using `HasValueVal` as the
Index: clang/unittests/Analysis/FlowSensitive/UncheckedOptionalAccessModelTest.cpp
===================================================================
--- clang/unittests/Analysis/FlowSensitive/UncheckedOptionalAccessModelTest.cpp
+++ clang/unittests/Analysis/FlowSensitive/UncheckedOptionalAccessModelTest.cpp
@@ -179,6 +179,11 @@
namespace detail {
+template <class T>
+auto try_add_lvalue_reference(int) -> type_identity<T&>;
+template <class T>
+auto try_add_lvalue_reference(...) -> type_identity<T>;
+
template <class T>
auto try_add_rvalue_reference(int) -> type_identity<T&&>;
template <class T>
@@ -186,6 +191,10 @@
} // namespace detail
+template <class T>
+struct add_lvalue_reference : decltype(detail::try_add_lvalue_reference<T>(0)) {
+};
+
template <class T>
struct add_rvalue_reference : decltype(detail::try_add_rvalue_reference<T>(0)) {
};
@@ -2318,6 +2327,26 @@
UnorderedElementsAre(Pair("merge", "unsafe: input.cc:19:7")));
}
+TEST_P(UncheckedOptionalAccessTest, AssignThroughLvalueReferencePtr) {
+ ExpectLatticeChecksFor(
+ R"(
+ #include "unchecked_optional_access_test.h"
+
+ template <typename T>
+ struct smart_ptr {
+ typename std::add_lvalue_reference<T>::type operator*() &;
+ };
+
+ void target() {
+ smart_ptr<$ns::$optional<float>> x;
+ *x = $ns::nullopt;
+ (*x).value();
+ /*[[check]]*/
+ }
+ )",
+ UnorderedElementsAre(Pair("check", "unsafe: input.cc:12: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
@@ -165,8 +165,8 @@
}
auto isCallReturningOptional() {
- return callExpr(callee(functionDecl(returns(anyOf(
- optionalOrAliasType(), referenceType(pointee(optionalOrAliasType())))))));
+ return callExpr(hasType(qualType(anyOf(
+ optionalOrAliasType(), referenceType(pointee(optionalOrAliasType()))))));
}
/// Creates a symbolic value for an `optional` value using `HasValueVal` as the
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
