From f3935b4d4bf3579d7911722742bbf45b57c588ee Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Fri, 4 Dec 2009 05:51:56 +0000 Subject: Make sure that overridden method decls are always canonical. llvm-svn: 90542 --- clang/lib/CodeGen/CGVtable.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'clang/lib/CodeGen') diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp index 5e448273729..869bcc0e6a6 100644 --- a/clang/lib/CodeGen/CGVtable.cpp +++ b/clang/lib/CodeGen/CGVtable.cpp @@ -742,7 +742,7 @@ bool VtableBuilder::OverrideMethod(GlobalDecl GD, llvm::Constant *m, mi != e; ++mi) { GlobalDecl OGD; - const CXXMethodDecl *OMD = (*mi)->getCanonicalDecl(); + const CXXMethodDecl *OMD = *mi; if (const CXXDestructorDecl *DD = dyn_cast(OMD)) OGD = GlobalDecl(DD, GD.getDtorType()); else @@ -933,7 +933,7 @@ void CGVtableInfo::ComputeMethodVtableIndices(const CXXRecordDecl *RD) { // Check if this method overrides a method in the primary base. for (CXXMethodDecl::method_iterator i = MD->begin_overridden_methods(), e = MD->end_overridden_methods(); i != e; ++i) { - const CXXMethodDecl *OverriddenMD = (*i)->getCanonicalDecl(); + const CXXMethodDecl *OverriddenMD = *i; const CXXRecordDecl *OverriddenRD = OverriddenMD->getParent(); assert(OverriddenMD->isCanonicalDecl() && "Should have the canonical decl of the overridden RD!"); -- cgit v1.2.3