diff --git a/lib/Analysis/BasicAliasAnalysis.cpp b/lib/Analysis/BasicAliasAnalysis.cpp
index 2c4efc4985b..144ba09a30a 100644
--- a/lib/Analysis/BasicAliasAnalysis.cpp
+++ b/lib/Analysis/BasicAliasAnalysis.cpp
@@ -307,24 +307,29 @@ BasicAliasAnalysis::getModRefInfo(CallSite CS, Value *P, unsigned Size) {
         return NoModRef;
     }
 
-    if (IntrinsicInst *II = dyn_cast<IntrinsicInst>(CS.getInstruction())) {
-      switch (II->getIntrinsicID()) {
-      default: break;
-      case Intrinsic::atomic_cmp_swap:
-      case Intrinsic::atomic_swap:
-      case Intrinsic::atomic_load_add:
-      case Intrinsic::atomic_load_sub:
-      case Intrinsic::atomic_load_and:
-      case Intrinsic::atomic_load_nand:
-      case Intrinsic::atomic_load_or:
-      case Intrinsic::atomic_load_xor:
-      case Intrinsic::atomic_load_max:
-      case Intrinsic::atomic_load_min:
-      case Intrinsic::atomic_load_umax:
-      case Intrinsic::atomic_load_umin:
-        if (alias(II->getOperand(1), Size, P, Size) == NoAlias)
-          return NoModRef;
-        break;
+    if (TD) {
+      if (IntrinsicInst *II = dyn_cast<IntrinsicInst>(CS.getInstruction())) {
+        switch (II->getIntrinsicID()) {
+        default: break;
+        case Intrinsic::atomic_cmp_swap:
+        case Intrinsic::atomic_swap:
+        case Intrinsic::atomic_load_add:
+        case Intrinsic::atomic_load_sub:
+        case Intrinsic::atomic_load_and:
+        case Intrinsic::atomic_load_nand:
+        case Intrinsic::atomic_load_or:
+        case Intrinsic::atomic_load_xor:
+        case Intrinsic::atomic_load_max:
+        case Intrinsic::atomic_load_min:
+        case Intrinsic::atomic_load_umax:
+        case Intrinsic::atomic_load_umin: {
+          Value *Op1 = II->getOperand(1);
+          unsigned Op1Size = TD->getTypeStoreSize(Op1->getType());
+          if (alias(Op1, Op1Size, P, Size) == NoAlias)
+            return NoModRef;
+          break;
+        }
+        }
       }
     }
   }