aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2012-09-28 22:46:07 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2012-09-28 22:46:07 +0000
commitb555a767baf4a1058bc6e4e05acbbee9e55d0e26 (patch)
treef6da57e020a88e2bfcb717104ec4692ca21a9642
parent538fe8f35b26b925e21a4329599c188d48264f0d (diff)
downloadllvm-b555a767baf4a1058bc6e4e05acbbee9e55d0e26.zip
llvm-b555a767baf4a1058bc6e4e05acbbee9e55d0e26.tar.gz
llvm-b555a767baf4a1058bc6e4e05acbbee9e55d0e26.tar.bz2
PR13941: Mark all virtual functions as unnamed_addr. It's not possible to
observe their addresses (taking their address gives the vtable slot) so we are free to merge their definitions. llvm-svn: 164864
-rw-r--r--clang/lib/CodeGen/CodeGenModule.cpp4
-rw-r--r--clang/test/CodeGenCXX/attr.cpp10
-rw-r--r--clang/test/CodeGenCXX/member-functions.cpp3
3 files changed, 14 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 164031a..d09c1c3 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -588,6 +588,10 @@ void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D,
if (isa<CXXConstructorDecl>(D) || isa<CXXDestructorDecl>(D))
F->setUnnamedAddr(true);
+ if (const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(D))
+ if (MD->isVirtual())
+ F->setUnnamedAddr(true);
+
if (LangOpts.getStackProtector() == LangOptions::SSPOn)
F->addFnAttr(llvm::Attribute::StackProtect);
else if (LangOpts.getStackProtector() == LangOptions::SSPReq)
diff --git a/clang/test/CodeGenCXX/attr.cpp b/clang/test/CodeGenCXX/attr.cpp
index 9e8740e..a0dd748 100644
--- a/clang/test/CodeGenCXX/attr.cpp
+++ b/clang/test/CodeGenCXX/attr.cpp
@@ -10,17 +10,21 @@ class C {
virtual void bar1() __attribute__((aligned(1)));
virtual void bar2() __attribute__((aligned(2)));
virtual void bar3() __attribute__((aligned(1024)));
+ void bar4() __attribute__((aligned(1024)));
} c;
-// CHECK: define void @_ZN1C4bar1Ev(%class.C* %this) nounwind align 2
+// CHECK: define void @_ZN1C4bar1Ev(%class.C* %this) unnamed_addr nounwind align 2
void C::bar1() { }
-// CHECK: define void @_ZN1C4bar2Ev(%class.C* %this) nounwind align 2
+// CHECK: define void @_ZN1C4bar2Ev(%class.C* %this) unnamed_addr nounwind align 2
void C::bar2() { }
-// CHECK: define void @_ZN1C4bar3Ev(%class.C* %this) nounwind align 1024
+// CHECK: define void @_ZN1C4bar3Ev(%class.C* %this) unnamed_addr nounwind align 1024
void C::bar3() { }
+// CHECK: define void @_ZN1C4bar4Ev(%class.C* %this) nounwind align 1024
+void C::bar4() { }
+
// PR6635
// CHECK: define i32 @_Z5test1v()
int test1() { return 10; }
diff --git a/clang/test/CodeGenCXX/member-functions.cpp b/clang/test/CodeGenCXX/member-functions.cpp
index b95763c..1310eb0 100644
--- a/clang/test/CodeGenCXX/member-functions.cpp
+++ b/clang/test/CodeGenCXX/member-functions.cpp
@@ -35,6 +35,9 @@ struct S {
static void g() { }
static void f();
+
+ // RUN: grep "define linkonce_odr void @_ZN1S1vEv.*unnamed_addr" %t
+ virtual void v() {}
};
// RUN: grep "define void @_ZN1S1fEv" %t