diff --git a/clang/lib/CodeGen/CodeGenModule.h b/clang/lib/CodeGen/CodeGenModule.h
index 6fe6cf5..c2c38e8 100644
--- a/clang/lib/CodeGen/CodeGenModule.h
+++ b/clang/lib/CodeGen/CodeGenModule.h
@@ -274,8 +274,9 @@
                                       int64_t nv_r, int64_t v_r);
 
   typedef std::pair<const CXXRecordDecl *, uint64_t> CtorVtable_t;
-  llvm::DenseMap<const CXXRecordDecl *, llvm::DenseMap<CtorVtable_t,
-                                                       int64_t>*> AddressPoints;
+  typedef llvm::DenseMap<const CXXRecordDecl *,
+                         llvm::DenseMap<CtorVtable_t, int64_t>*> AddrMap_t;
+  llvm::DenseMap<const CXXRecordDecl *, AddrMap_t*> AddressPoints;
 
   /// GetCXXBaseClassOffset - Returns the offset from a derived class to its
   /// base class. Returns null if the offset is 0.