diff options
| -rw-r--r-- | clang.xcodeproj/project.pbxproj | 1 | ||||
| -rw-r--r-- | lib/CodeGen/CGExprCXX.cpp | 15 | ||||
| -rw-r--r-- | test/CodeGenCXX/attr-final-devirtualize-virtual-function-calls.cpp | 13 |
3 files changed, 25 insertions, 4 deletions
diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj index 9c95d0a3de..fa1e24574e 100644 --- a/clang.xcodeproj/project.pbxproj +++ b/clang.xcodeproj/project.pbxproj @@ -2039,6 +2039,7 @@ isa = PBXProject; buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "clang" */; compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( English, diff --git a/lib/CodeGen/CGExprCXX.cpp b/lib/CodeGen/CGExprCXX.cpp index 750e609c85..e3b5f71b27 100644 --- a/lib/CodeGen/CGExprCXX.cpp +++ b/lib/CodeGen/CGExprCXX.cpp @@ -55,7 +55,14 @@ RValue CodeGenFunction::EmitCXXMemberCall(const CXXMethodDecl *MD, /// canDevirtualizeMemberFunctionCalls - Checks whether virtual calls on given /// expr can be devirtualized. -static bool canDevirtualizeMemberFunctionCalls(const Expr *Base) { +static bool canDevirtualizeMemberFunctionCalls(const Expr *Base, + const CXXMethodDecl *MD) { + + // If the member function has the "final" attribute, we know that it can't be + // overridden and can therefor devirtualize it. + if (MD->hasAttr<FinalAttr>()) + return true; + if (const DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(Base)) { if (const VarDecl *VD = dyn_cast<VarDecl>(DRE->getDecl())) { // This is a record decl. We know the type and can devirtualize it. @@ -76,7 +83,7 @@ static bool canDevirtualizeMemberFunctionCalls(const Expr *Base) { // 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; } @@ -152,7 +159,7 @@ RValue CodeGenFunction::EmitCXXMemberCallExpr(const CXXMemberCallExpr *CE, // We also don't emit a virtual call if the base expression has a record type // because then we know what the type is. bool UseVirtualCall = MD->isVirtual() && !ME->hasQualifier() - && !canDevirtualizeMemberFunctionCalls(ME->getBase()); + && !canDevirtualizeMemberFunctionCalls(ME->getBase(), MD); llvm::Value *Callee; if (const CXXDestructorDecl *Dtor = dyn_cast<CXXDestructorDecl>(MD)) { @@ -267,7 +274,7 @@ CodeGenFunction::EmitCXXOperatorMemberCallExpr(const CXXOperatorCallExpr *E, This = LV.getAddress(); llvm::Value *Callee; - if (MD->isVirtual() && !canDevirtualizeMemberFunctionCalls(E->getArg(0))) + if (MD->isVirtual() && !canDevirtualizeMemberFunctionCalls(E->getArg(0), MD)) Callee = BuildVirtualCall(MD, This, Ty); else Callee = CGM.GetAddrOfFunction(MD, Ty); diff --git a/test/CodeGenCXX/attr-final-devirtualize-virtual-function-calls.cpp b/test/CodeGenCXX/attr-final-devirtualize-virtual-function-calls.cpp new file mode 100644 index 0000000000..b96cf04e6d --- /dev/null +++ b/test/CodeGenCXX/attr-final-devirtualize-virtual-function-calls.cpp @@ -0,0 +1,13 @@ +// RUN: %clang_cc1 %s -O3 -emit-llvm -o - | FileCheck %s + +namespace Test1 { + struct A { + virtual int f() __attribute__((final)) { return 1; } + }; + + // CHECK: define i32 @_ZN5Test11fEPNS_1AE + int f(A* a) { + // CHECK: ret i32 1 + return a->f(); + } +} |