diff options
| author | Alex Rosenberg <alexr@leftfield.org> | 2012-10-05 23:12:53 +0000 |
|---|---|---|
| committer | Alex Rosenberg <alexr@leftfield.org> | 2012-10-05 23:12:53 +0000 |
| commit | c857ce8b08397ed778928b8a000732ca90da2a8c (patch) | |
| tree | eb48f0e9aca0f475514a537cd6a3a37c40392572 | |
| parent | 26994a1c293e33bfa23d7c52e89a3e2eee31a976 (diff) | |
Propagate calling convention for aliases and weakrefs.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165343 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 5 | ||||
| -rw-r--r-- | test/CodeGen/alias.c | 30 |
2 files changed, 26 insertions, 9 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index d09c1c3260..b62e18cdca 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -843,7 +843,8 @@ llvm::Constant *CodeGenModule::GetWeakRefReference(const ValueDecl *VD) { llvm::Constant *Aliasee; if (isa<llvm::FunctionType>(DeclTy)) - Aliasee = GetOrCreateLLVMFunction(AA->getAliasee(), DeclTy, GlobalDecl(), + Aliasee = GetOrCreateLLVMFunction(AA->getAliasee(), DeclTy, + GlobalDecl(cast<FunctionDecl>(VD)), /*ForVTable=*/false); else Aliasee = GetOrCreateLLVMGlobal(AA->getAliasee(), @@ -1929,7 +1930,7 @@ void CodeGenModule::EmitAliasDefinition(GlobalDecl GD) { // if a deferred decl. llvm::Constant *Aliasee; if (isa<llvm::FunctionType>(DeclTy)) - Aliasee = GetOrCreateLLVMFunction(AA->getAliasee(), DeclTy, GlobalDecl(), + Aliasee = GetOrCreateLLVMFunction(AA->getAliasee(), DeclTy, GD, /*ForVTable=*/false); else Aliasee = GetOrCreateLLVMGlobal(AA->getAliasee(), diff --git a/test/CodeGen/alias.c b/test/CodeGen/alias.c index ed90a7c491..3784b35fdf 100644 --- a/test/CodeGen/alias.c +++ b/test/CodeGen/alias.c @@ -1,24 +1,25 @@ -// RUN: %clang_cc1 -triple i386-pc-linux-gnu -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -triple i386-pc-linux-gnu -emit-llvm -o - %s | FileCheck -check-prefix=CHECKBASIC %s +// RUN: %clang_cc1 -triple armv7a-eabi -mfloat-abi hard -emit-llvm -o - %s | FileCheck -check-prefix=CHECKCC %s int g0; -// CHECK: @g0 = common global i32 0 +// CHECKBASIC: @g0 = common global i32 0 static int bar1 = 42; -// CHECK: @bar1 = internal global i32 42 +// CHECKBASIC: @bar1 = internal global i32 42 extern int g1; extern int g1 __attribute((alias("g0"))); -// CHECK: @g1 = alias i32* @g0 +// CHECKBASIC: @g1 = alias i32* @g0 void f0(void) { } extern void f1(void); extern void f1(void) __attribute((alias("f0"))); -// CHECK: @f1 = alias void ()* @f0 -// CHECK: define void @f0() nounwind { +// CHECKBASIC: @f1 = alias void ()* @f0 +// CHECKBASIC: define void @f0() nounwind { // Make sure that aliases cause referenced values to be emitted. // PR3200 static inline int foo1() { return 0; } -// CHECK: define internal i32 @foo1() +// CHECKBASIC: define internal i32 @foo1() int foo() __attribute__((alias("foo1"))); int bar() __attribute__((alias("bar1"))); @@ -28,3 +29,18 @@ void test7() { test6(); } // test6 is emitted as extern. // test6 changes to alias. int test6() __attribute__((alias("test7"))); +static int inner(int a) { return 0; } +static int inner_weak(int a) { return 0; } +extern __typeof(inner) inner_a __attribute__((alias("inner"))); +static __typeof(inner_weak) inner_weak_a __attribute__((weakref, alias("inner_weak"))); +// CHECKCC: @inner_a = alias i32 (i32)* @inner +// CHECKCC: define internal arm_aapcs_vfpcc i32 @inner(i32 %a) nounwind { + +int outer(int a) { return inner(a); } +// CHECKCC: define arm_aapcs_vfpcc i32 @outer(i32 %a) nounwind { +// CHECKCC: %call = call arm_aapcs_vfpcc i32 @inner(i32 %0) + +int outer_weak(int a) { return inner_weak_a(a); } +// CHECKCC: define arm_aapcs_vfpcc i32 @outer_weak(i32 %a) nounwind { +// CHECKCC: %call = call arm_aapcs_vfpcc i32 @inner_weak(i32 %0) +// CHECKCC: define internal arm_aapcs_vfpcc i32 @inner_weak(i32 %a) nounwind { |