More devirtualization improvements.

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

diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp
index ed7ee4298ccbe8b4941b08e7a09e5cbc5344e1b8..f19067941e71d738784dc2fe6a9ca11a0c6d39be 100644 (file)
--- a/lib/CodeGen/CGCXX.cpp
+++ b/lib/CodeGen/CGCXX.cpp
@@ -214,6 +214,10 @@ static bool canDevirtualizeMemberFunctionCalls(const Expr *Base) {
   if (isa<CXXTemporaryObjectExpr>(Base))
     return true;
   
+  // Check if this is a call expr that returns a record type.
+  if (const CallExpr *CE = dyn_cast<CallExpr>(Base))
+    return CE->getCallReturnType()->isRecordType();
+  
   // We can't devirtualize the call.
   return false;
 }

diff --git a/test/CodeGenCXX/devirtualize-virtual-function-calls.cpp b/test/CodeGenCXX/devirtualize-virtual-function-calls.cpp
index 3dd2551bbc15c1ace42e58ef59450b0e4ebd4f50..76f9520bfd1a42563415919b92af9537d8ef8723 100644 (file)
--- a/test/CodeGenCXX/devirtualize-virtual-function-calls.cpp
+++ b/test/CodeGenCXX/devirtualize-virtual-function-calls.cpp
@@ -2,8 +2,12 @@
 
 struct A {
   virtual void f();
+  
+  A h();
 };
 
+A g();
+
 void f(A a, A *ap, A& ar) {
   // This should not be a virtual function call.
   
@@ -18,4 +22,10 @@ void f(A a, A *ap, A& ar) {
   
   // CHECK: call void @_ZN1A1fEv
   A().f();
+
+  // CHECK: call void @_ZN1A1fEv
+  g().f();
+  
+  // CHECK: call void @_ZN1A1fEv
+  a.h().f();
 }