This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGeda2eaabf294: [clang][dataflow] Fix crash when having
boolean-to-integral casts. (authored by junaire).
Changed prior to commit:
https://reviews.llvm.org/D140753?vs=485657&id=485669#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D140753/new/
https://reviews.llvm.org/D140753
Files:
clang/lib/Analysis/FlowSensitive/DataflowEnvironment.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
@@ -2970,6 +2970,23 @@
cxxConstructorDecl(ofClass(hasName("Target"))));
}
+// This is regression test, it shouldn't crash.
+TEST_P(UncheckedOptionalAccessTest, Bitfield) {
+ using namespace ast_matchers;
+ ExpectDiagnosticsFor(
+ R"(
+ #include "unchecked_optional_access_test.h"
+ struct Dst {
+ unsigned int n : 1;
+ };
+ void target() {
+ $ns::$optional<bool> v;
+ Dst d;
+ if (v.has_value())
+ d.n = v.value();
+ }
+ )");
+}
// FIXME: Add support for:
// - constructors (copy, move)
// - assignment operators (default, copy, move)
Index: clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
===================================================================
--- clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
+++ clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
@@ -93,7 +93,19 @@
Environment::ValueModel &Model) {
// Join distinct boolean values preserving information about the constraints
// in the respective path conditions.
- if (auto *Expr1 = dyn_cast<BoolValue>(&Val1)) {
+ if (Type->isBooleanType()) {
+ // FIXME: The type check above is a workaround and should be unnecessary.
+ // However, right now we can end up with BoolValue's in integer-typed
+ // variables due to our incorrect handling of boolean-to-integer casts (we
+ // just propagate the BoolValue to the result of the cast). For example:
+ // std::optional<bool> o;
+ //
+ //
+ // int x;
+ // if (o.has_value()) {
+ // x = o.value();
+ // }
+ auto *Expr1 = cast<BoolValue>(&Val1);
auto *Expr2 = cast<BoolValue>(&Val2);
auto &MergedVal = MergedEnv.makeAtomicBoolValue();
MergedEnv.addToFlowCondition(MergedEnv.makeOr(
Index: clang/unittests/Analysis/FlowSensitive/UncheckedOptionalAccessModelTest.cpp
===================================================================
--- clang/unittests/Analysis/FlowSensitive/UncheckedOptionalAccessModelTest.cpp
+++ clang/unittests/Analysis/FlowSensitive/UncheckedOptionalAccessModelTest.cpp
@@ -2970,6 +2970,23 @@
cxxConstructorDecl(ofClass(hasName("Target"))));
}
+// This is regression test, it shouldn't crash.
+TEST_P(UncheckedOptionalAccessTest, Bitfield) {
+ using namespace ast_matchers;
+ ExpectDiagnosticsFor(
+ R"(
+ #include "unchecked_optional_access_test.h"
+ struct Dst {
+ unsigned int n : 1;
+ };
+ void target() {
+ $ns::$optional<bool> v;
+ Dst d;
+ if (v.has_value())
+ d.n = v.value();
+ }
+ )");
+}
// FIXME: Add support for:
// - constructors (copy, move)
// - assignment operators (default, copy, move)
Index: clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
===================================================================
--- clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
+++ clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
@@ -93,7 +93,19 @@
Environment::ValueModel &Model) {
// Join distinct boolean values preserving information about the constraints
// in the respective path conditions.
- if (auto *Expr1 = dyn_cast<BoolValue>(&Val1)) {
+ if (Type->isBooleanType()) {
+ // FIXME: The type check above is a workaround and should be unnecessary.
+ // However, right now we can end up with BoolValue's in integer-typed
+ // variables due to our incorrect handling of boolean-to-integer casts (we
+ // just propagate the BoolValue to the result of the cast). For example:
+ // std::optional<bool> o;
+ //
+ //
+ // int x;
+ // if (o.has_value()) {
+ // x = o.value();
+ // }
+ auto *Expr1 = cast<BoolValue>(&Val1);
auto *Expr2 = cast<BoolValue>(&Val2);
auto &MergedVal = MergedEnv.makeAtomicBoolValue();
MergedEnv.addToFlowCondition(MergedEnv.makeOr(
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
