Index: lib/Analysis/DependenceAnalysis.cpp
===================================================================
--- lib/Analysis/DependenceAnalysis.cpp
+++ lib/Analysis/DependenceAnalysis.cpp
@@ -623,11 +623,27 @@
 }
 
 static AliasResult underlyingObjectsAlias(AliasAnalysis *AA,
-                                          const DataLayout &DL, const Value *A,
+                                          const DataLayout &DL,
+                                          const Instruction *AI, const Value *A,
+                                          const Instruction *BI,
                                           const Value *B) {
   const Value *AObj = GetUnderlyingObject(A, DL);
   const Value *BObj = GetUnderlyingObject(B, DL);
-  return AA->alias(AObj, BObj);
+
+  MemoryLocation MAObj(AObj);
+  MemoryLocation MBObj(BObj);
+
+  if (const auto *LI = dyn_cast<const LoadInst>(AI))
+    LI->getAAMetadata(MAObj.AATags);
+  else if (const auto *SI = dyn_cast<const StoreInst>(AI))
+    SI->getAAMetadata(MAObj.AATags);
+
+  if (const auto *LI = dyn_cast<const LoadInst>(BI))
+    LI->getAAMetadata(MBObj.AATags);
+  else if (const auto *SI = dyn_cast<const StoreInst>(BI))
+    SI->getAAMetadata(MBObj.AATags);
+
+  return AA->alias(MAObj, MBObj);
 }
 
 
@@ -3305,8 +3321,8 @@
   Value *SrcPtr = getPointerOperand(Src);
   Value *DstPtr = getPointerOperand(Dst);
 
-  switch (underlyingObjectsAlias(AA, F->getParent()->getDataLayout(), DstPtr,
-                                 SrcPtr)) {
+  switch (underlyingObjectsAlias(AA, F->getParent()->getDataLayout(), Dst,
+                                 DstPtr, Src, SrcPtr)) {
   case MayAlias:
   case PartialAlias:
     // cannot analyse objects if we don't understand their aliasing.
@@ -3754,8 +3770,8 @@
   assert(isLoadOrStore(Dst));
   Value *SrcPtr = getPointerOperand(Src);
   Value *DstPtr = getPointerOperand(Dst);
-  assert(underlyingObjectsAlias(AA, F->getParent()->getDataLayout(), DstPtr,
-                                SrcPtr) == MustAlias);
+  assert(underlyingObjectsAlias(AA, F->getParent()->getDataLayout(), Dst,
+                                DstPtr, Src, SrcPtr) == MustAlias);
 
   // establish loop nesting levels
   establishNestingLevels(Src, Dst);
Index: test/Analysis/DependenceAnalysis/TBAA.ll
===================================================================
--- /dev/null
+++ test/Analysis/DependenceAnalysis/TBAA.ll
@@ -0,0 +1,53 @@
+; RUN: opt < %s -analyze -basicaa -tbaa -da | FileCheck %s
+
+; CHECK-LABEL: test
+; CHECK: da analyze - consistent input [S 0]!
+; CHECK: da analyze - none!
+; CHECK: da analyze - none!
+
+define void @test(i32 %I, i32 %J, i32* nocapture %A, i16* nocapture readonly %B) {
+entry:
+  %cmp = icmp ne i32 %J, 0
+  %cmp122 = icmp ne i32 %I, 0
+  %or.cond = and i1 %cmp, %cmp122
+  br i1 %or.cond, label %for.outer.preheader, label %for.end
+
+for.outer.preheader:
+  br label %for.outer
+
+for.outer:
+  %i.us = phi i32 [ %add8.us, %for.latch ], [ 0, %for.outer.preheader ]
+  br label %for.inner
+
+for.inner:
+  %j.us = phi i32 [ 0, %for.outer ], [ %inc.us, %for.inner ]
+  %sum1.us = phi i32 [ 0, %for.outer ], [ %add.us, %for.inner ]
+  %arrayidx.us = getelementptr inbounds i16, i16* %B, i32 %j.us
+  %0 = load i16, i16* %arrayidx.us, align 4, !tbaa !9
+  %sext = sext i16 %0 to i32
+  %add.us = add i32 %sext, %sum1.us
+  %inc.us = add nuw i32 %j.us, 1
+  %exitcond = icmp eq i32 %inc.us, %J
+  br i1 %exitcond, label %for.latch, label %for.inner
+
+for.latch:
+  %add.us.lcssa = phi i32 [ %add.us, %for.inner ]
+  %arrayidx6.us = getelementptr inbounds i32, i32* %A, i32 %i.us
+  store i32 %add.us.lcssa, i32* %arrayidx6.us, align 4, !tbaa !5
+  %add8.us = add nuw i32 %i.us, 1
+  %exitcond25 = icmp eq i32 %add8.us, %I
+  br i1 %exitcond25, label %for.end.loopexit, label %for.outer
+
+for.end.loopexit:
+  br label %for.end
+
+for.end:
+  ret void
+}
+
+!5 = !{!6, !6, i64 0}
+!6 = !{!"int", !7, i64 0}
+!7 = !{!"omnipotent char", !8, i64 0}
+!8 = !{!"Simple C/C++ TBAA"}
+!9 = !{!10, !10, i64 0}
+!10 = !{!"short", !7, i64 0}
\ No newline at end of file