mboehme created this revision.
Herald added subscribers: martong, xazax.hun.
Herald added a reviewer: NoQ.
Herald added a project: All.
mboehme requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
This can break release builds that set `-Werror` because they will error out on
an unused variable.
Depends On D156229 <https://reviews.llvm.org/D156229>
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D156230
Files:
clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
Index: clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
===================================================================
--- clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
+++ clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
@@ -122,12 +122,11 @@
Value *MergedVal = nullptr;
if (auto *StructVal1 = dyn_cast<StructValue>(&Val1)) {
- auto *StructVal2 = cast<StructValue>(&Val2);
-
// Values to be merged are always associated with the same location in
// `LocToVal`. The location stored in `StructVal` should therefore also
// be the same.
- assert(&StructVal1->getAggregateLoc() == &StructVal2->getAggregateLoc());
+ assert(&StructVal1->getAggregateLoc() ==
+ &cast<StructValue>(&Val2)->getAggregateLoc());
// `StructVal1` and `StructVal2` may have different properties associated
// with them. Create a new `StructValue` without any properties so that we
Index: clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
===================================================================
--- clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
+++ clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
@@ -122,12 +122,11 @@
Value *MergedVal = nullptr;
if (auto *StructVal1 = dyn_cast<StructValue>(&Val1)) {
- auto *StructVal2 = cast<StructValue>(&Val2);
-
// Values to be merged are always associated with the same location in
// `LocToVal`. The location stored in `StructVal` should therefore also
// be the same.
- assert(&StructVal1->getAggregateLoc() == &StructVal2->getAggregateLoc());
+ assert(&StructVal1->getAggregateLoc() ==
+ &cast<StructValue>(&Val2)->getAggregateLoc());
// `StructVal1` and `StructVal2` may have different properties associated
// with them. Create a new `StructValue` without any properties so that we
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
