diff options
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 3 | ||||
| -rw-r--r-- | test/CodeGenCXX/attr.cpp | 14 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index f7fe69e326..b9013a8667 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -348,6 +348,9 @@ void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D, if (const AlignedAttr *AA = D->getAttr<AlignedAttr>()) F->setAlignment(AA->getAlignment()/8); + // C++ ABI requires 2-byte alignment for member functions. + if (F->getAlignment() < 16 && isa<CXXMethodDecl>(D)) + F->setAlignment(16/8); } void CodeGenModule::SetCommonAttributes(const Decl *D, diff --git a/test/CodeGenCXX/attr.cpp b/test/CodeGenCXX/attr.cpp index 57507d87b3..8077b7839d 100644 --- a/test/CodeGenCXX/attr.cpp +++ b/test/CodeGenCXX/attr.cpp @@ -10,8 +10,9 @@ int foo() { } class C { - virtual void bar1() __attribute__((aligned(2))); - virtual void bar2() __attribute__((aligned(1024))); + virtual void bar1() __attribute__((aligned(1))); + virtual void bar2() __attribute__((aligned(2))); + virtual void bar3() __attribute__((aligned(1024))); } c; void C::bar1() { } @@ -23,6 +24,13 @@ void C::bar1() { } void C::bar2() { } -// CHECK:.align 10, 0x90 +// CHECK:.align 1, 0x90 // CHECK-NEXT:.globl __ZN1C4bar2Ev // CHECK-NEXT:__ZN1C4bar2Ev: + + +void C::bar3() { } + +// CHECK:.align 10, 0x90 +// CHECK-NEXT:.globl __ZN1C4bar3Ev +// CHECK-NEXT:__ZN1C4bar3Ev: |