1 files changed, 10 insertions, 2 deletions
diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp
index 1b6ddeceac7..c69c85c3357 100644
--- a/polly/lib/Analysis/ScopInfo.cpp
+++ b/polly/lib/Analysis/ScopInfo.cpp
@@ -528,9 +528,17 @@ void ScopStmt::buildAccesses(TempScop &tempScop, const Region &CurRegion) {
                                       E = AccFuncs->end();
        I != E; ++I) {
     MemAccs.push_back(new MemoryAccess(I->first, I->second, this));
-    assert(!InstructionToAccess.count(I->second) &&
+
+    // We do not track locations for scalar memory accesses at the moment.
+    //
+    // We do not have a use for this information at the moment. If we need this
+    // at some point, the "instruction -> access" mapping needs to be enhanced
+    // as a single instruction could then possibly perform multiple accesses.
+    if (!I->first.isScalar()) {
+      assert(!InstructionToAccess.count(I->second) &&
            "Unexpected 1-to-N mapping on instruction to access map!");
-    InstructionToAccess[I->second] = MemAccs.back();
+      InstructionToAccess[I->second] = MemAccs.back();
+    }
   }
 }