Index: include/polly/ScopBuilder.h
===================================================================
--- include/polly/ScopBuilder.h
+++ include/polly/ScopBuilder.h
@@ -202,8 +202,8 @@
   /// access any memory and thus have no effect.
   void buildStmts(Region &SR);
 
-  /// Build the access functions for the basic block @p BB in or represented by
-  /// @p Stmt.
+  /// Build the access functions for the statement @p Stmt in or represented by
+  /// @p BB.
   ///
   /// @param Stmt               Statement to add MemoryAccesses to.
   /// @param BB                 A basic block in @p R.
Index: include/polly/ScopInfo.h
===================================================================
--- include/polly/ScopInfo.h
+++ include/polly/ScopInfo.h
@@ -1309,6 +1309,9 @@
 public:
   ~ScopStmt();
 
+  /// The index of the block statement in this BB.
+  unsigned StmtID;
+
   /// Get an isl_ctx pointer.
   isl_ctx *getIslCtx() const;
 
@@ -1596,6 +1599,8 @@
 
   const char *getBaseName() const;
 
+  unsigned getStmtID() const { return StmtID; }
+
   /// Set the isl AST build.
   void setAstBuild(isl::ast_build B) { Build = B; }
 
@@ -1726,6 +1731,9 @@
   /// The statements in this Scop.
   StmtSet Stmts;
 
+  /// Number of block statements per BB.
+  DenseMap<BasicBlock *, unsigned> NumStmtMap;
+
   /// Parameters of this Scop
   ParameterSetTy Parameters;
 
@@ -2182,8 +2190,9 @@
   /// @param BB              The basic block we build the statement for.
   /// @param SurroundingLoop The loop the created statement is contained in.
   /// @param Instructions    The instructions in the statement.
+  /// @param count           The index of created statement in @p BB.
   void addScopStmt(BasicBlock *BB, Loop *SurroundingLoop,
-                   std::vector<Instruction *> Instructions);
+                   std::vector<Instruction *> Instructions, unsigned count);
 
   /// Create a new SCoP statement for @p R.
   ///
Index: lib/Analysis/ScopBuilder.cpp
===================================================================
--- lib/Analysis/ScopBuilder.cpp
+++ lib/Analysis/ScopBuilder.cpp
@@ -620,16 +620,26 @@
     if (I->isSubRegion())
       buildStmts(*I->getNodeAs<Region>());
     else {
+      unsigned count = 0;
       std::vector<Instruction *> Instructions;
       for (Instruction &Inst : *I->getNodeAs<BasicBlock>()) {
         Loop *L = LI.getLoopFor(Inst.getParent());
         if (!isa<TerminatorInst>(&Inst) && !isIgnoredIntrinsic(&Inst) &&
             !canSynthesize(&Inst, *scop, &SE, L))
           Instructions.push_back(&Inst);
+        if (Inst.getMetadata("polly_split_after")) {
+          Loop *SurroundingLoop = LI.getLoopFor(I->getNodeAs<BasicBlock>());
+          count++;
+          scop->addScopStmt(I->getNodeAs<BasicBlock>(), SurroundingLoop,
+                            Instructions, count);
+          Instructions.clear();
+        }
       }
       Loop *SurroundingLoop = LI.getLoopFor(I->getNodeAs<BasicBlock>());
+      count++;
       scop->addScopStmt(I->getNodeAs<BasicBlock>(), SurroundingLoop,
-                        Instructions);
+                        Instructions, count);
+      scop->NumStmtMap[I->getNodeAs<BasicBlock>()] = count;
     }
 }
 
@@ -646,7 +656,20 @@
   if (isErrorBlock(BB, scop->getRegion(), LI, DT) && !IsExitBlock)
     return;
 
+  unsigned StmtID = 1;
+  bool flag = false;
   for (Instruction &Inst : BB) {
+    if (flag) {
+      flag = false;
+      StmtID++;
+    }
+
+    if (Inst.getMetadata("polly_split_after"))
+      flag = true;
+
+    if (Stmt && Stmt->isBlockStmt() && StmtID != Stmt->getStmtID())
+      continue;
+
     PHINode *PHI = dyn_cast<PHINode>(&Inst);
     if (PHI)
       buildPHIAccesses(Stmt, PHI, NonAffineSubRegion, IsExitBlock);
Index: lib/Analysis/ScopInfo.cpp
===================================================================
--- lib/Analysis/ScopInfo.cpp
+++ lib/Analysis/ScopInfo.cpp
@@ -4818,10 +4818,12 @@
 }
 
 void Scop::addScopStmt(BasicBlock *BB, Loop *SurroundingLoop,
-                       std::vector<Instruction *> Instructions) {
+                       std::vector<Instruction *> Instructions,
+                       unsigned count) {
   assert(BB && "Unexpected nullptr!");
   Stmts.emplace_back(*this, *BB, SurroundingLoop, Instructions);
   auto *Stmt = &Stmts.back();
+  Stmt->StmtID = count;
   StmtMap[BB].push_back(Stmt);
   for (Instruction *Inst : Instructions) {
     assert(!InstStmtMap.count(Inst) &&
@@ -4990,8 +4992,6 @@
   auto StmtMapIt = StmtMap.find(BB);
   if (StmtMapIt == StmtMap.end())
     return {};
-  assert(StmtMapIt->second.size() == 1 &&
-         "Each statement corresponds to exactly one BB.");
   return StmtMapIt->second;
 }
 
Index: test/Isl/CodeGen/stmt_split_no_dependence.ll
===================================================================
--- /dev/null
+++ test/Isl/CodeGen/stmt_split_no_dependence.ll
@@ -0,0 +1,44 @@
+; RUN: opt %loadPolly -polly-codegen -S < %s | FileCheck %s
+;
+; CHECK:   store i32 %8, i32* %scevgep, align 4, !alias.scope !1, !noalias !3
+; CHECK:   store i32 %9, i32* %scevgep4, align 4, !alias.scope !4, !noalias !5
+;
+;      void func(int *A, int *B){
+;        for (int i = 0; i < 1024; i+=1) {
+;      Stmt:
+;          A[i] = i;
+;          B[i] = i;
+;        }
+;      }
+;
+; Function Attrs: noinline nounwind uwtable
+define void @func(i32* %A, i32* %B) #0 {
+entry:
+  br label %for.cond
+
+for.cond: 					 ; preds = %for.inc, %entry
+  %i.0 = phi i32 [ 0, %entry ], [ %add, %for.inc ]
+  %cmp = icmp slt i32 %i.0, 1024
+  br i1 %cmp, label %for.body, label %for.end
+
+for.body: 					 ; preds = %for.cond
+  br label %Stmt
+
+Stmt: 						 ; preds = %for.body
+  %idxprom = sext i32 %i.0 to i64
+  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom
+  store i32 %i.0, i32* %arrayidx, align 4, !polly_split_after !0
+  %idxprom1 = sext i32 %i.0 to i64
+  %arrayidx2 = getelementptr inbounds i32, i32* %B, i64 %idxprom1
+  store i32 %i.0, i32* %arrayidx2, align 4
+  br label %for.inc
+
+for.inc: 					 ; preds = %Stmt
+  %add = add nsw i32 %i.0, 1
+  br label %for.cond
+
+for.end: 					 ; preds = %for.cond
+  ret void
+}
+
+!0 = !{!"polly_split_after"} 
Index: test/ScopInfo/statement.ll
===================================================================
--- test/ScopInfo/statement.ll
+++ test/ScopInfo/statement.ll
@@ -7,11 +7,17 @@
 ;          B[i] = i;
 ;        }
 ;      }
-
-; CHECK:       Instructions {
-; CHECK-NEXT:      store i32 %i.0, i32* %arrayidx, align 4
-; CHECK-NEXT:      store i32 %i.0, i32* %arrayidx2, align 4
-; CHECK-NEXT:    }
+;
+; CHECK:        MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 0]
+; CHECK-NEXT        { Stmt_Stmt[i0] -> MemRef_A[i0] };
+; CHECK:        Instructions {
+; CHECK-NEXT:         store i32 %i.0, i32* %arrayidx, align 4, !polly_split_after !0
+; CHECK-NEXT:   }
+; CHECK:        MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 0]
+; CHECK-NEXT:       { Stmt_Stmt[i0] -> MemRef_B[i0] };
+; CHECK:        Instructions {
+; CHECK-NEXT:         store i32 %i.0, i32* %arrayidx2, align 4
+; CHECK-NEXT:   }
 
 ; Function Attrs: noinline nounwind uwtable
 define void @func(i32* %A, i32* %B) #0 {
@@ -29,7 +35,7 @@
 Stmt:                                             ; preds = %for.body
   %idxprom = sext i32 %i.0 to i64
   %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom
-  store i32 %i.0, i32* %arrayidx, align 4
+  store i32 %i.0, i32* %arrayidx, align 4, !polly_split_after !0
   %idxprom1 = sext i32 %i.0 to i64
   %arrayidx2 = getelementptr inbounds i32, i32* %B, i64 %idxprom1
   store i32 %i.0, i32* %arrayidx2, align 4
@@ -42,3 +48,5 @@
 for.end:                                          ; preds = %for.cond
   ret void
 }
+
+!0 = !{!"polly_split_after"}