diff --git a/lib/CodeGen/CodeGenTBAA.cpp b/lib/CodeGen/CodeGenTBAA.cpp
index bff9fa2..ed2b13f 100644
--- a/lib/CodeGen/CodeGenTBAA.cpp
+++ b/lib/CodeGen/CodeGenTBAA.cpp
@@ -77,6 +77,10 @@
     }
   }
 
+  // For now, treat all pointers as equivalent to each other.
+  if (Ty->isPointerType())
+    return MetadataCache[Ty] = getTBAAInfoForNamedType("TBAA.pointer", Char);
+
   // For now, handle any other kind of type conservatively.
   return MetadataCache[Ty] = Char;
 }