diff --git a/llvm/lib/Analysis/AliasAnalysis.cpp b/llvm/lib/Analysis/AliasAnalysis.cpp
index 3ec009ca4adde..4f59577c1cab3 100644
--- a/llvm/lib/Analysis/AliasAnalysis.cpp
+++ b/llvm/lib/Analysis/AliasAnalysis.cpp
@@ -421,7 +421,7 @@ ModRefInfo AAResults::getModRefInfo(const LoadInst *L,
                                     const MemoryLocation &Loc,
                                     AAQueryInfo &AAQI) {
   // Be conservative in the face of atomic.
-  if (isStrongerThan(L->getOrdering(), AtomicOrdering::Unordered))
+  if (isStrongerThanMonotonic(L->getOrdering()))
     return ModRefInfo::ModRef;
 
   // If the load address doesn't alias the given address, it doesn't read
@@ -431,6 +431,13 @@ ModRefInfo AAResults::getModRefInfo(const LoadInst *L,
     if (AR == AliasResult::NoAlias)
       return ModRefInfo::NoModRef;
   }
+
+  assert(!isStrongerThanMonotonic(L->getOrdering()) &&
+         "Stronger atomic orderings should have been handled above!");
+
+  if (isStrongerThanUnordered(L->getOrdering()))
+    return ModRefInfo::ModRef;
+
   // Otherwise, a load just reads.
   return ModRefInfo::Ref;
 }
@@ -439,7 +446,7 @@ ModRefInfo AAResults::getModRefInfo(const StoreInst *S,
                                     const MemoryLocation &Loc,
                                     AAQueryInfo &AAQI) {
   // Be conservative in the face of atomic.
-  if (isStrongerThan(S->getOrdering(), AtomicOrdering::Unordered))
+  if (isStrongerThanMonotonic(S->getOrdering()))
     return ModRefInfo::ModRef;
 
   if (Loc.Ptr) {
@@ -457,7 +464,13 @@ ModRefInfo AAResults::getModRefInfo(const StoreInst *S,
       return ModRefInfo::NoModRef;
   }
 
-  // Otherwise, a store just writes.
+  assert(!isStrongerThanMonotonic(S->getOrdering()) &&
+         "Stronger atomic orderings should have been handled above!");
+
+  if (isStrongerThanUnordered(S->getOrdering()))
+    return ModRefInfo::ModRef;
+
+  // A store just writes.
   return ModRefInfo::Mod;
 }
 
diff --git a/llvm/test/Transforms/DeadStoreElimination/atomic-todo.ll b/llvm/test/Transforms/DeadStoreElimination/atomic-todo.ll
deleted file mode 100644
index 1c160442f8579..0000000000000
--- a/llvm/test/Transforms/DeadStoreElimination/atomic-todo.ll
+++ /dev/null
@@ -1,23 +0,0 @@
-; XFAIL: *
-; RUN: opt -passes=dse -S < %s | FileCheck %s
-
-target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
-target triple = "x86_64-apple-macosx10.7.0"
-
-; Basic correctness tests for atomic stores.
-; Note that it turns out essentially every transformation DSE does is legal on
-; atomic ops, just some transformations are not allowed across release-acquire pairs.
-
-@x = common global i32 0, align 4
-@y = common global i32 0, align 4
-
-; DSE across monotonic load (allowed as long as the eliminated store isUnordered)
-define i32 @test9() {
-; CHECK-LABEL: test9
-; CHECK-NOT: store i32 0
-; CHECK: store i32 1
-  store i32 0, ptr @x
-  %x = load atomic i32, ptr @y monotonic, align 4
-  store i32 1, ptr @x
-  ret i32 %x
-}
diff --git a/llvm/test/Transforms/DeadStoreElimination/atomic.ll b/llvm/test/Transforms/DeadStoreElimination/atomic.ll
index 55b9384e88d93..5c74b43f5b27e 100644
--- a/llvm/test/Transforms/DeadStoreElimination/atomic.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/atomic.ll
@@ -37,9 +37,21 @@ define void @test4() {
   ret void
 }
 
-; DSE unordered store overwriting non-atomic store (allowed)
+; DSE doesn't remove monotonic store.
 define void @test5() {
 ; CHECK-LABEL: @test5(
+; CHECK-NEXT:    store atomic i32 2, ptr @x monotonic, align 4
+; CHECK-NEXT:    store i32 1, ptr @x, align 4
+; CHECK-NEXT:    ret void
+;
+  store atomic i32 2, ptr @x monotonic, align 4
+  store i32 1, ptr @x
+  ret void
+}
+
+; DSE unordered store overwriting non-atomic store (allowed)
+define void @test6() {
+; CHECK-LABEL: @test6(
 ; CHECK-NEXT:    store atomic i32 1, ptr @x unordered, align 4
 ; CHECK-NEXT:    ret void
 ;
@@ -49,8 +61,8 @@ define void @test5() {
 }
 
 ; DSE no-op unordered atomic store (allowed)
-define void @test6() {
-; CHECK-LABEL: @test6(
+define void @test7() {
+; CHECK-LABEL: @test7(
 ; CHECK-NEXT:    ret void
 ;
   %x = load atomic i32, ptr @x unordered, align 4
@@ -60,8 +72,8 @@ define void @test6() {
 
 ; DSE seq_cst store (be conservative; DSE doesn't have infrastructure
 ; to reason about atomic operations).
-define void @test7() {
-; CHECK-LABEL: @test7(
+define void @test8() {
+; CHECK-LABEL: @test8(
 ; CHECK-NEXT:    [[A:%.*]] = alloca i32, align 4
 ; CHECK-NEXT:    store atomic i32 0, ptr [[A]] seq_cst, align 4
 ; CHECK-NEXT:    ret void
@@ -73,8 +85,8 @@ define void @test7() {
 
 ; DSE and seq_cst load (be conservative; DSE doesn't have infrastructure
 ; to reason about atomic operations).
-define i32 @test8() {
-; CHECK-LABEL: @test8(
+define i32 @test9() {
+; CHECK-LABEL: @test9(
 ; CHECK-NEXT:    [[A:%.*]] = alloca i32, align 4
 ; CHECK-NEXT:    call void @randomop(ptr [[A]])
 ; CHECK-NEXT:    store i32 0, ptr [[A]], align 4
@@ -88,10 +100,35 @@ define i32 @test8() {
   ret i32 %x
 }
 
-; DSE across monotonic store (allowed as long as the eliminated store isUnordered)
-define void @test10() {
+; DSE across monotonic load (allowed if the monotonic load's address is NoAlias)
+define i32 @test10() {
 ; CHECK-LABEL: test10
 ; CHECK-NOT: store i32 0
+; CHECK: store i32 1
+  store i32 0, ptr @x
+  %x = load atomic i32, ptr @y monotonic, align 4
+  store i32 1, ptr @x
+  ret i32 %x
+}
+
+; DSE across monotonic load (blocked if the atomic load's address isn't NoAlias)
+define i32 @test11(ptr %ptr) {
+; CHECK-LABEL: @test11(
+; CHECK-NEXT:    store i32 0, ptr @x, align 4
+; CHECK-NEXT:    [[X:%.*]] = load atomic i32, ptr [[PTR:%.*]] monotonic, align 4
+; CHECK-NEXT:    store i32 1, ptr @x, align 4
+; CHECK-NEXT:    ret i32 [[X]]
+;
+  store i32 0, ptr @x
+  %x = load atomic i32, ptr %ptr monotonic, align 4
+  store i32 1, ptr @x
+  ret i32 %x
+}
+
+; DSE across monotonic store (allowed as long as the eliminated store isUnordered)
+define void @test12() {
+; CHECK-LABEL: test12
+; CHECK-NOT: store i32 0
 ; CHECK: store i32 1
   store i32 0, ptr @x
   store atomic i32 42, ptr @y monotonic, align 4
@@ -100,8 +137,8 @@ define void @test10() {
 }
 
 ; DSE across monotonic load (forbidden since the eliminated store is atomic)
-define i32 @test11() {
-; CHECK-LABEL: @test11(
+define i32 @test13() {
+; CHECK-LABEL: @test13(
 ; CHECK-NEXT:    store atomic i32 0, ptr @x monotonic, align 4
 ; CHECK-NEXT:    [[X:%.*]] = load atomic i32, ptr @y monotonic, align 4
 ; CHECK-NEXT:    store atomic i32 1, ptr @x monotonic, align 4
@@ -114,8 +151,8 @@ define i32 @test11() {
 }
 
 ; DSE across monotonic store (forbidden since the eliminated store is atomic)
-define void @test12() {
-; CHECK-LABEL: @test12(
+define void @test14() {
+; CHECK-LABEL: @test14(
 ; CHECK-NEXT:    store atomic i32 0, ptr @x monotonic, align 4
 ; CHECK-NEXT:    store atomic i32 42, ptr @y monotonic, align 4
 ; CHECK-NEXT:    store atomic i32 1, ptr @x monotonic, align 4