Fixed a copy-paste bug in findAllStoresForLoad function while finding…

… matching stores for loads with partial overlap
liuml07 · Aug 1, 2018 · 86f3b8a · 86f3b8a
1 parent f3d64a3
commit 86f3b8a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/Giri/TraceFile.cpp b/lib/Giri/TraceFile.cpp
@@ -899,18 +899,22 @@ void TraceFile::findAllStoresForLoad(DynValue &DV,
       addToWorklist(NDV, Sources, DV);
 
       Entry &store_entry = trace[store_index];
+      // Find stores corresponding to any non-overlapping part of load
+      // before the start of matched store
       if (load_entry.address < store_entry.address) {
         Entry new_entry;
         new_entry.address = load_entry.address;
         new_entry.length = store_entry.address - load_entry.address;
         findAllStoresForLoad(DV, Sources, store_index - 1, new_entry);
       }
 
+      // Find stores corresponding to any non-overlapping part of load
+      // before the start of matched store
       unsigned long store_end = store_entry.address + store_entry.length;
       unsigned long load_end = load_entry.address + load_entry.length;
       if (store_end < load_end) {
         Entry new_entry;
-        new_entry.address = load_entry.address;
+        new_entry.address = store_end;
         new_entry.length = load_end - store_end;
         findAllStoresForLoad(DV, Sources, store_index - 1, new_entry);
       }