From: Devang Patel <dpatel@apple.com>
Date: Tue, 9 Feb 2010 19:09:28 +0000 (+0000)
Subject: Fix virtual bases' debug info.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5322da6ba08728fe4ee9b14f468961eddc915dc;p=clang

Fix virtual bases' debug info.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@95678 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
index 8b3e195fa5..6f84add037 100644
--- a/lib/CodeGen/CGDebugInfo.cpp
+++ b/lib/CodeGen/CGDebugInfo.cpp
@@ -641,7 +641,7 @@ CollectCXXMemberFunctions(const CXXRecordDecl *RD, llvm::DICompileUnit Unit,
         E = RD->method_end(); I != E; ++I) {
     const CXXMethodDecl *Method = *I;
     
-    if (Method->isImplicit())
+    if (Method->isImplicit() && !Method->isUsed())
       continue;
 
     EltTys.push_back(CreateCXXMemberFunction(Method, Unit, RecordTy));
@@ -666,7 +666,9 @@ CollectCXXBases(const CXXRecordDecl *RD, llvm::DICompileUnit Unit,
       cast<CXXRecordDecl>(BI->getType()->getAs<RecordType>()->getDecl());
     
     if (BI->isVirtual()) {
-      BaseOffset = RL.getVBaseClassOffset(Base);
+      // virtual base offset index is -ve. The code generator emits dwarf
+      // expression where it expects +ve number.
+      BaseOffset = 0 - CGM.getVtableInfo().getVirtualBaseOffsetIndex(RD, Base);
       BFlags = llvm::DIType::FlagVirtual;
     } else
       BaseOffset = RL.getBaseClassOffset(Base);