If the base type of a member call is a record type we don't need to emit a virtual call.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@83816 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp
index ceb6e49..af49942 100644
--- a/lib/CodeGen/CGCXX.cpp
+++ b/lib/CodeGen/CGCXX.cpp
@@ -230,10 +230,13 @@
// C++ [class.virtual]p12:
// Explicit qualification with the scope operator (5.1) suppresses the
// virtual call mechanism.
+ //
+ // We also don't emit a virtual call if the base expression has a record type
+ // because then we know what the type is.
llvm::Value *Callee;
- if (MD->isVirtual() && !ME->hasQualifier())
- // FIXME: push getCanonicalDecl as a conversion using the static type system (CanCXXMethodDecl).
- Callee = BuildVirtualCall(MD->getCanonicalDecl(), This, Ty);
+ if (MD->isVirtual() && !ME->hasQualifier() &&
+ !ME->getBase()->getType()->isRecordType())
+ Callee = BuildVirtualCall(MD, This, Ty);
else if (const CXXDestructorDecl *Destructor
= dyn_cast<CXXDestructorDecl>(MD))
Callee = CGM.GetAddrOfFunction(GlobalDecl(Destructor, Dtor_Complete), Ty);
@@ -795,8 +798,6 @@
llvm::Value *
CodeGenFunction::BuildVirtualCall(const CXXMethodDecl *MD, llvm::Value *&This,
const llvm::Type *Ty) {
- // FIXME: If we know the dynamic type, we don't have to do a virtual dispatch.
-
int64_t Index = CGM.getVtableInfo().getMethodVtableIndex(MD);
Ty = llvm::PointerType::get(Ty, 0);