about summary refs log tree commit diff homepage
path: root/lib/Expr
diff options
context:
space:
mode:
authorLukáš Zaoral <lzaoral@redhat.com>2022-04-17 13:32:15 +0200
committerMartinNowack <2443641+MartinNowack@users.noreply.github.com>2023-03-20 16:05:38 +0000
commit1398e960ec9aca3f0ceac5e37062631986b9c2a8 (patch)
treeff7ed01317fa2ef90b9678c8ea1bc86fb94ba531 /lib/Expr
parentd9da9eadbc0aacf61b336231560abb67bcba91ad (diff)
downloadklee-1398e960ec9aca3f0ceac5e37062631986b9c2a8.tar.gz
ConstantArrayExprVisitor: Fix detection of multiple array indices
Previously, the code did two consecutive checks.  First one succeeded
only if the given index was not already seen and the second one did
an analogous check but for arrays.  However, if the given index usage
was already detected for some array, its usage for another array that
already had some other index detected would be silently skipped and the
`incompatible` flag would not be set.

Therefore, if the code contained e.g. the following conditional jump on two
arrays with two symbolic indices, the multi-index access would remain
undetected:

if ((array1[k] + array2[x] + array2[k]) == 0)

Resulting in the following output:

KLEE: WARNING: OPT_I: infeasible branch!
KLEE: WARNING: OPT_I: successful
Diffstat (limited to 'lib/Expr')
-rw-r--r--lib/Expr/ArrayExprVisitor.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/lib/Expr/ArrayExprVisitor.cpp b/lib/Expr/ArrayExprVisitor.cpp
index 0965308a..cf0da7f6 100644
--- a/lib/Expr/ArrayExprVisitor.cpp
+++ b/lib/Expr/ArrayExprVisitor.cpp
@@ -73,18 +73,16 @@ ExprVisitor::Action ConstantArrayExprVisitor::visitRead(const ReadExpr &re) {
     }
     IndexCompatibilityExprVisitor compatible;
     compatible.visit(re.index);
-    if (compatible.isCompatible() &&
-        addedIndexes.find(re.index.get()->hash()) == addedIndexes.end()) {
-      if (arrays.find(re.updates.root) == arrays.end()) {
-        arrays.insert(
-            std::make_pair(re.updates.root, std::vector<ref<Expr> >()));
-      } else {
-        // Another possible index to resolve, currently unsupported
-        incompatible = true;
-        return Action::skipChildren();
+    if (compatible.isCompatible()) {
+      if (arrays.count(re.updates.root) > 0) {
+        const auto &indices = arrays[re.updates.root];
+        if (!indices.empty() && indices.front() != re.index) {
+          // Another possible index to resolve, currently unsupported
+          incompatible = true;
+          return Action::skipChildren();
+        }
       }
-      arrays.find(re.updates.root)->second.push_back(re.index);
-      addedIndexes.insert(re.index.get()->hash());
+      arrays[re.updates.root].push_back(re.index);
     } else if (compatible.hasInnerReads()) {
       // This Read has an inner Read, we want to optimize the inner one
       // to create a cascading effect during assignment evaluation