diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index 5768e5b4db5c..2b03d2c603cc 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -562,14 +562,24 @@ CollectCXXMemberFunctions(const CXXRecordDecl *Decl,
       MethodLine = PLoc.getLine();
     }
 
+    // Collect virtual method info.
+    llvm::DIType ContainingType;
+    unsigned Virtuality = 0; 
+    unsigned VIndex = 0;
+    if (Method->isVirtual()) {
+      // FIXME: Identify pure virtual functions.
+      Virtuality = llvm::dwarf::DW_VIRTUALITY_virtual;
+      VIndex = CGM.getVtableInfo().getMethodVtableIndex(Method);
+      ContainingType = RecordTy;
+    }
+
     llvm::DISubprogram SP =
       DebugFactory.CreateSubprogram(RecordTy , MethodName, MethodName, 
                                     MethodLinkageName,
                                     MethodDefUnit, MethodLine,
                                     MethodTy, false, 
                                     Method->isThisDeclarationADefinition(),
-                                    0 /*Virtuality*/, 0 /*VIndex*/, 
-                                    llvm::DIType() /*ContainingType*/);
+                                    Virtuality, VIndex, ContainingType);
     if (Method->isThisDeclarationADefinition())
       SPCache[cast<FunctionDecl>(Method)] = llvm::WeakVH(SP.getNode());
     EltTys.push_back(SP);