diff --git a/llvm/test/Transforms/GVNSink/barrier-call.ll b/llvm/test/Transforms/GVNSink/barrier-call.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/Transforms/GVNSink/barrier-call.ll
@@ -0,0 +1,60 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2
+; Test to make sure that a function call that needs to be a barrier to sinking
+; stores is indeed a barrier.
+; RUN: opt -passes=gvn-sink -S < %s | FileCheck %s
+
+%struct.node = type { i32, ptr, ptr, ptr, i32, i32, i32, i32 }
+declare i32 @foo(i32 %x)
+
+define void @sink_store(ptr nocapture %r, i32 %index) {
+; CHECK-LABEL: define void @sink_store
+; CHECK-SAME: (ptr nocapture [[R:%.*]], i32 [[INDEX:%.*]]) {
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[NODE_0_IN16:%.*]] = getelementptr inbounds [[STRUCT_NODE:%.*]], ptr [[R]], i64 0, i32 2
+; CHECK-NEXT:    [[NODE_017:%.*]] = load ptr, ptr [[NODE_0_IN16]], align 8
+; CHECK-NEXT:    [[INDEX_ADDR:%.*]] = alloca i32, align 4
+; CHECK-NEXT:    store i32 [[INDEX]], ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[TMP0:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i32 [[TMP0]], 0
+; CHECK-NEXT:    br i1 [[CMP]], label [[IF_THEN:%.*]], label [[IF_ELSE:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    [[TMP1:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[P1:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 0, i32 6
+; CHECK-NEXT:    store i32 [[TMP1]], ptr [[P1]], align 4
+; CHECK-NEXT:    br label [[IF_END:%.*]]
+; CHECK:       if.else:
+; CHECK-NEXT:    [[TMP2:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[ADD:%.*]] = add nsw i32 [[TMP2]], 1
+; CHECK-NEXT:    [[P3:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 0, i32 6
+; CHECK-NEXT:    store i32 [[ADD]], ptr [[P3]], align 4
+; CHECK-NEXT:    [[TMP3:%.*]] = call i32 @foo(i32 5)
+; CHECK-NEXT:    br label [[IF_END]]
+; CHECK:       if.end:
+; CHECK-NEXT:    ret void
+;
+entry:
+  %node.0.in16 = getelementptr inbounds %struct.node, ptr %r, i64 0, i32 2
+  %node.017 = load ptr, ptr %node.0.in16, align 8
+  %index.addr = alloca i32, align 4
+  store i32 %index, ptr %index.addr, align 4
+  %0 = load i32, ptr %index.addr, align 4
+  %cmp = icmp slt i32 %0, 0
+  br i1 %cmp, label %if.then, label %if.else
+
+if.then:                                          ; preds = %entry
+  %1 = load i32, ptr %index.addr, align 4
+  %p1 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
+  store i32 %1, ptr %p1, align 4
+  br label %if.end
+
+if.else:                                          ; preds = %entry
+  %2 = load i32, ptr %index.addr, align 4
+  %add = add nsw i32 %2, 1
+  %p3 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
+  store i32 %add, ptr %p3, align 4
+  call i32 @foo(i32 5)                            ; Barrier
+  br label %if.end
+
+if.end:                                           ; preds = %if.else, %if.then
+  ret void
+}
diff --git a/llvm/test/Transforms/GVNSink/load-barrier.ll b/llvm/test/Transforms/GVNSink/load-barrier.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/Transforms/GVNSink/load-barrier.ll
@@ -0,0 +1,61 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2
+; Test to make sure that load from the same address as a store and appears
+; after the store prevents the store from being sunk.
+; RUN: opt -passes=gvn-sink -S < %s | FileCheck %s
+
+%struct.node = type { i32, ptr, ptr, ptr, i32, i32, i32, i32 }
+
+define void @sink_store(ptr nocapture %r, i32 %index) {
+; CHECK-LABEL: define void @sink_store
+; CHECK-SAME: (ptr nocapture [[R:%.*]], i32 [[INDEX:%.*]]) {
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[NODE_0_IN16:%.*]] = getelementptr inbounds [[STRUCT_NODE:%.*]], ptr [[R]], i64 0, i32 2
+; CHECK-NEXT:    [[NODE_017:%.*]] = load ptr, ptr [[NODE_0_IN16]], align 8
+; CHECK-NEXT:    [[INDEX_ADDR:%.*]] = alloca i32, align 4
+; CHECK-NEXT:    store i32 [[INDEX]], ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[TMP0:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i32 [[TMP0]], 0
+; CHECK-NEXT:    br i1 [[CMP]], label [[IF_THEN:%.*]], label [[IF_ELSE:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    [[TMP1:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[P1:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 0, i32 6
+; CHECK-NEXT:    store i32 [[TMP1]], ptr [[P1]], align 4
+; CHECK-NEXT:    [[P2:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 0, i32 6
+; CHECK-NEXT:    [[BARRIER:%.*]] = load i32, ptr [[P2]], align 4
+; CHECK-NEXT:    br label [[IF_END:%.*]]
+; CHECK:       if.else:
+; CHECK-NEXT:    [[TMP2:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[ADD:%.*]] = add nsw i32 [[TMP2]], 1
+; CHECK-NEXT:    [[P3:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 0, i32 6
+; CHECK-NEXT:    store i32 [[ADD]], ptr [[P3]], align 4
+; CHECK-NEXT:    br label [[IF_END]]
+; CHECK:       if.end:
+; CHECK-NEXT:    ret void
+;
+entry:
+  %node.0.in16 = getelementptr inbounds %struct.node, ptr %r, i64 0, i32 2
+  %node.017 = load ptr, ptr %node.0.in16, align 8
+  %index.addr = alloca i32, align 4
+  store i32 %index, ptr %index.addr, align 4
+  %0 = load i32, ptr %index.addr, align 4
+  %cmp = icmp slt i32 %0, 0
+  br i1 %cmp, label %if.then, label %if.else
+
+if.then:                                          ; preds = %entry
+  %1 = load i32, ptr %index.addr, align 4
+  %p1 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
+  store i32 %1, ptr %p1, align 4
+  %p2 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
+  %barrier = load i32, ptr %p2, align 4
+  br label %if.end
+
+if.else:                                          ; preds = %entry
+  %2 = load i32, ptr %index.addr, align 4
+  %add = add nsw i32 %2, 1
+  %p3 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
+  store i32 %add, ptr %p3, align 4
+  br label %if.end
+
+if.end:                                           ; preds = %if.else, %if.then
+  ret void
+}
diff --git a/llvm/test/Transforms/GVNSink/no-barrier-store.ll b/llvm/test/Transforms/GVNSink/no-barrier-store.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/Transforms/GVNSink/no-barrier-store.ll
@@ -0,0 +1,61 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2
+; Test to make sure that stores in a diamond get merged with a non barrier
+; store after the store instruction to be sunk.
+; RUN: opt -passes=gvn-sink -S < %s | FileCheck %s
+
+%struct.node = type { i32, ptr, ptr, ptr, i32, i32, i32, i32 }
+
+define void @sink_store(ptr nocapture %r, i32 %index) {
+; CHECK-LABEL: define void @sink_store
+; CHECK-SAME: (ptr nocapture [[R:%.*]], i32 [[INDEX:%.*]]) {
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[NODE_0_IN16:%.*]] = getelementptr inbounds [[STRUCT_NODE:%.*]], ptr [[R]], i64 0, i32 2
+; CHECK-NEXT:    [[NODE_017:%.*]] = load ptr, ptr [[NODE_0_IN16]], align 8
+; CHECK-NEXT:    [[INDEX_ADDR:%.*]] = alloca i32, align 4
+; CHECK-NEXT:    store i32 [[INDEX]], ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[TMP0:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i32 [[TMP0]], 0
+; CHECK-NEXT:    br i1 [[CMP]], label [[IF_THEN:%.*]], label [[IF_ELSE:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    [[TMP1:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[P1:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 0, i32 6
+; CHECK-NEXT:    store i32 [[TMP1]], ptr [[P1]], align 4
+; CHECK-NEXT:    br label [[IF_END:%.*]]
+; CHECK:       if.else:
+; CHECK-NEXT:    [[TMP2:%.*]] = load i32, ptr [[INDEX_ADDR]], align 4
+; CHECK-NEXT:    [[ADD:%.*]] = add nsw i32 [[TMP2]], 1
+; CHECK-NEXT:    [[P2:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 0, i32 6
+; CHECK-NEXT:    store i32 [[ADD]], ptr [[P2]], align 4
+; CHECK-NEXT:    [[P3:%.*]] = getelementptr inbounds [[STRUCT_NODE]], ptr [[NODE_017]], i32 5, i32 6
+; CHECK-NEXT:    store i32 [[ADD]], ptr [[P3]], align 4
+; CHECK-NEXT:    br label [[IF_END]]
+; CHECK:       if.end:
+; CHECK-NEXT:    ret void
+;
+entry:
+  %node.0.in16 = getelementptr inbounds %struct.node, ptr %r, i64 0, i32 2
+  %node.017 = load ptr, ptr %node.0.in16, align 8
+  %index.addr = alloca i32, align 4
+  store i32 %index, ptr %index.addr, align 4
+  %0 = load i32, ptr %index.addr, align 4
+  %cmp = icmp slt i32 %0, 0
+  br i1 %cmp, label %if.then, label %if.else
+
+if.then:                                          ; preds = %entry
+  %1 = load i32, ptr %index.addr, align 4
+  %p1 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
+  store i32 %1, ptr %p1, align 4
+  br label %if.end
+
+if.else:                                          ; preds = %entry
+  %2 = load i32, ptr %index.addr, align 4
+  %add = add nsw i32 %2, 1
+  %p2 = getelementptr inbounds %struct.node, ptr %node.017, i32 0, i32 6
+  store i32 %add, ptr %p2, align 4
+  %p3 = getelementptr inbounds %struct.node, ptr %node.017, i32 5, i32 6
+  store i32 %add, ptr %p3, align 4                ; This is not a barrier
+  br label %if.end
+
+if.end:                                           ; preds = %if.else, %if.then
+  ret void
+}