diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp
index 5d3944f6dd01..d2b6c08712ed 100644
--- a/clang/lib/CodeGen/CGVtable.cpp
+++ b/clang/lib/CodeGen/CGVtable.cpp
@@ -132,6 +132,9 @@ class VtableBuilder {
   /// Components - The components of the vtable being built.
   llvm::SmallVector<VtableComponent, 64> Components;
 
+  /// AddressPoints - Address points for the vtable being built.
+  CGVtableInfo::AddressPointsMapTy AddressPoints;
+
   /// layoutSimpleVtable - A test function that will layout very simple vtables
   /// without any bases. Just used for testing for now.
   void layoutSimpleVtable(const CXXRecordDecl *RD);
@@ -159,6 +162,9 @@ void VtableBuilder::layoutSimpleVtable(const CXXRecordDecl *RD) {
   // Next, add the RTTI.
   Components.push_back(VtableComponent::MakeRTTI(RD));
   
+  // Record the address point.
+  AddressPoints.insert(std::make_pair(BaseSubobject(RD, 0), Components.size()));
+
   // Now go through all virtual member functions and add them.
   for (CXXRecordDecl::method_iterator I = RD->method_begin(),
        E = RD->method_end(); I != E; ++I) {
@@ -178,9 +184,34 @@ void VtableBuilder::dumpLayout(llvm::raw_ostream& Out) {
   Out << "Vtable for '" << MostDerivedClass->getQualifiedNameAsString();
   Out << "' (" << Components.size() << " entries).\n";
 
-  for (unsigned I = 0, E = Components.size(); I != E; ++I) {
-    Out << llvm::format("%4d | ", I);
+  // Iterate through the address points and insert them into a new map where
+  // they are keyed by the index and not the base object.
+  // Since an address point can be shared by multiple subobjects, we use an
+  // STL multimap.
+  std::multimap<uint64_t, BaseSubobject> AddressPointsByIndex;
+  for (CGVtableInfo::AddressPointsMapTy::const_iterator I = 
+       AddressPoints.begin(), E = AddressPoints.end(); I != E; ++I) {
+    const BaseSubobject& Base = I->first;
+    uint64_t Index = I->second;
     
+    AddressPointsByIndex.insert(std::make_pair(Index, Base));
+  }
+  
+  for (unsigned I = 0, E = Components.size(); I != E; ++I) {
+    if (AddressPointsByIndex.count(I)) {
+      assert(AddressPointsByIndex.count(I) == 1 &&
+             "FIXME: Handle dumping multiple base subobjects for a single "
+             "address point!");
+      
+      const BaseSubobject &Base = AddressPointsByIndex.find(I)->second;
+      Out << "       -- (" << Base.getBase()->getQualifiedNameAsString();
+      
+      // FIXME: Instead of dividing by 8, we should be using CharUnits.
+      Out << ", " << Base.getBaseOffset() / 8 << ") vtable address --\n";
+    }
+
+    Out << llvm::format("%4d | ", I);
+
     const VtableComponent &Component = Components[I];
 
     // Dump the component.
@@ -207,7 +238,7 @@ void VtableBuilder::dumpLayout(llvm::raw_ostream& Out) {
     }
 
     }
-    
+
     Out << '\n';
   }
   
diff --git a/clang/test/CodeGenCXX/vtable-layout.cpp b/clang/test/CodeGenCXX/vtable-layout.cpp
index 6bfa025beaab..beb82ef90548 100644
--- a/clang/test/CodeGenCXX/vtable-layout.cpp
+++ b/clang/test/CodeGenCXX/vtable-layout.cpp
@@ -4,6 +4,7 @@ namespace Test1 {
 // CHECK:      Vtable for 'Test1::A' (3 entries).
 // CHECK-NEXT:   0 | offset_to_top (0)
 // CHECK-NEXT:   1 | Test1::A RTTI
+// CHECK-NEXT:       -- (Test1::A, 0) vtable address --
 // CHECK-NEXT:   2 | Test1::A::f
 struct A {
   virtual void f();