Index: lib/Analysis/ScopInfo.cpp
===================================================================
--- lib/Analysis/ScopInfo.cpp
+++ lib/Analysis/ScopInfo.cpp
@@ -3974,12 +3974,38 @@
                   ArrayRef<const SCEV *>(), ScopArrayInfo::MK_Value);
 }
 void ScopInfo::ensureValueRead(Value *Value, BasicBlock *UserBB) {
+
+  // There cannot be an "access" for constants.
+  if (isa<Constant>(Value) || isa<BasicBlock>(Value))
+    return;
+
+  // If the instruction can be synthesized and the user is in the region we do
+  // not need to add a value dependences.
+  Region &ScopRegion = scop->getRegion();
+  if (canSynthesize(Value, LI, SE, &ScopRegion))
+    return;
+
+  // Determine the ScopStmt containing the value's definition and use. There is
+  // no defining ScopStmt if the value is a function argument, a global value,
+  // or defined outside the SCoP.
+  Instruction *ValueInst = dyn_cast<Instruction>(Value);
+  ScopStmt *ValueStmt =
+      ValueInst ? scop->getStmtForBasicBlock(ValueInst->getParent()) : nullptr;
+
   ScopStmt *UserStmt = scop->getStmtForBasicBlock(UserBB);
 
   // We do not model uses outside the scop.
   if (!UserStmt)
     return;
 
+  // Add MemoryAccess for invariant values only if requested.
+  if (!ModelReadOnlyScalars && !ValueStmt)
+    return;
+
+  // Ignore use-def chains within the same ScopStmt.
+  if (ValueStmt == UserStmt)
+    return;
+
   // Do not create another MemoryAccess for reloading the value if one already
   // exists.
   if (UserStmt->lookupValueReadOf(Value))
Index: test/Isl/CodeGen/phi-defined-before-scop.ll
===================================================================
--- test/Isl/CodeGen/phi-defined-before-scop.ll
+++ test/Isl/CodeGen/phi-defined-before-scop.ll
@@ -4,7 +4,6 @@
 ; CHECK-NEXT: %tmp7.ph.merge = phi %struct.wibble* [ %tmp7.ph.final_reload, %polly.exiting ], [ %tmp7.ph, %bb6.region_exiting ]
 
 ; CHECK-LABEL: polly.stmt.bb3:
-; CHECK-NEXT: %tmp2.s2a.reload = load %struct.wibble*, %struct.wibble** %tmp2.s2a
 ; CHECK-NEXT: store %struct.wibble* %tmp2, %struct.wibble** %tmp7.s2a
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
Index: test/Isl/CodeGen/uninitialized_scalar_memory.ll
===================================================================
--- test/Isl/CodeGen/uninitialized_scalar_memory.ll
+++ test/Isl/CodeGen/uninitialized_scalar_memory.ll
@@ -5,7 +5,6 @@
 ;
 ; CHECK:      polly.start:
 ; CHECK-NEXT:   store float %ebig.0, float* %ebig.0.s2a
-; CHECK-NEXT:   store i32 %iebig.0, i32* %iebig.0.s2a
 ; CHECK-NEXT:   br label %polly.stmt.if.end.entry
 ;
 ;    int g(void);
Index: test/ScopInfo/NonAffine/non_affine_loop_used_later.ll
===================================================================
--- test/ScopInfo/NonAffine/non_affine_loop_used_later.ll
+++ test/ScopInfo/NonAffine/non_affine_loop_used_later.ll
@@ -37,8 +37,6 @@
 ; CHECK:                [N] -> { Stmt_bb4__TO__bb18[i0] -> MemRef_A[i0] };
 ; CHECK:            MayWriteAccess := [Reduction Type: NONE] [Scalar: 0]
 ; CHECK:                [N] -> { Stmt_bb4__TO__bb18[i0] -> MemRef_A[i0] };
-; CHECK:            ReadAccess := [Reduction Type: NONE] [Scalar: 1]
-; CHECK:                [N] -> { Stmt_bb4__TO__bb18[i0] -> MemRef_smax[] };
 ; CHECK:            MustWriteAccess := [Reduction Type: NONE] [Scalar: 1]
 ; CHECK:                [N] -> { Stmt_bb4__TO__bb18[i0] -> MemRef_j_2__phi[] };
 ; CHECK:            ReadAccess := [Reduction Type: NONE] [Scalar: 1]
Index: test/ScopInfo/pointer-used-as-base-pointer-and-scalar-read.ll
===================================================================
--- test/ScopInfo/pointer-used-as-base-pointer-and-scalar-read.ll
+++ test/ScopInfo/pointer-used-as-base-pointer-and-scalar-read.ll
@@ -6,16 +6,12 @@
 
 ; CHECK: Arrays {
 ; CHECK:     float MemRef_A[*]; // Element size 4
-; CHECK:     float* MemRef_A; // Element size 8
 ; CHECK:     float* MemRef_x__phi; // Element size 8
-; CHECK:     float* MemRef_B; // Element size 8
 ; CHECK:     float* MemRef_C[*]; // Element size 8
 ; CHECK: }
 ; CHECK: Arrays (Bounds as pw_affs) {
 ; CHECK:     float MemRef_A[*]; // Element size 4
-; CHECK:     float* MemRef_A; // Element size 8
 ; CHECK:     float* MemRef_x__phi; // Element size 8
-; CHECK:     float* MemRef_B; // Element size 8
 ; CHECK:     float* MemRef_C[*]; // Element size 8
 ; CHECK: }
 ; CHECK: Alias Groups (0):
@@ -28,8 +24,6 @@
 ; CHECK:             [p] -> { Stmt_then[i0] -> [i0, 1] };
 ; CHECK:         MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 0]
 ; CHECK:             [p] -> { Stmt_then[i0] -> MemRef_A[0] };
-; CHECK:         ReadAccess :=       [Reduction Type: NONE] [Scalar: 1]
-; CHECK:             [p] -> { Stmt_then[i0] -> MemRef_A[] };
 ; CHECK:         MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 1]
 ; CHECK:             [p] -> { Stmt_then[i0] -> MemRef_x__phi[] };
 ; CHECK:   Stmt_else
@@ -39,8 +33,6 @@
 ; CHECK:             [p] -> { Stmt_else[i0] -> [i0, 0] : p >= 33 or p <= 31 };
 ; CHECK:         MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 0]
 ; CHECK:             [p] -> { Stmt_else[i0] -> MemRef_A[0] };
-; CHECK:         ReadAccess :=       [Reduction Type: NONE] [Scalar: 1]
-; CHECK:             [p] -> { Stmt_else[i0] -> MemRef_B[] };
 ; CHECK:         MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 1]
 ; CHECK:             [p] -> { Stmt_else[i0] -> MemRef_x__phi[] };
 ; CHECK:   Stmt_bb8
Index: test/ScopInfo/same-base-address-scalar-and-array.ll
===================================================================
--- test/ScopInfo/same-base-address-scalar-and-array.ll
+++ test/ScopInfo/same-base-address-scalar-and-array.ll
@@ -4,7 +4,6 @@
 ; as it is used as a memory base pointer (%0) but also as a scalar (%out.addr.0.lcssa).
 ;
 ; CHECK:         Arrays {
-; CHECK-NEXT:        float* MemRef_out; // Element size 8
 ; CHECK-NEXT:        float* MemRef_out_addr_0_lcssa; // Element size 8
 ; CHECK-NEXT:        float MemRef_out[*]; // Element size 4
 ; CHECK-NEXT:    }