From 141465c9625c09de622b9959aad8d6012c201ac7 Mon Sep 17 00:00:00 2001 From: Alex Rosenberg Date: Mon, 10 Sep 2012 14:35:15 -0700 Subject: [PATCH] Propagate calling convention for aliases and weakrefs. --- lib/CodeGen/CodeGenModule.cpp | 24 ++++++++++++++++++++---- test/CodeGen/alias.c | 30 +++++++++++++++++++++++------- 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 87e7454..ad1235d 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -832,10 +832,18 @@ llvm::Constant *CodeGenModule::GetWeakRefReference(const ValueDecl *VD) { llvm::GlobalValue *Entry = GetGlobalValue(AA->getAliasee()); llvm::Constant *Aliasee; - if (isa(DeclTy)) + if (isa(DeclTy)) { Aliasee = GetOrCreateLLVMFunction(AA->getAliasee(), DeclTy, GlobalDecl(), /*ForVTable=*/false); - else + // Set proper calling convention for the aliasee whose + // storage duration is static. + if (llvm::Function *F = dyn_cast(Aliasee)) { + const FunctionDecl *FD = cast(VD); + const CGFunctionInfo& FI = getTypes().arrangeFunctionDeclaration(FD); + unsigned CC = FI.getEffectiveCallingConvention(); + F->setCallingConv(static_cast(CC)); + } + } else Aliasee = GetOrCreateLLVMGlobal(AA->getAliasee(), llvm::PointerType::getUnqual(DeclTy), 0); if (!Entry) { @@ -1918,10 +1926,18 @@ void CodeGenModule::EmitAliasDefinition(GlobalDecl GD) { // Create a reference to the named value. This ensures that it is emitted // if a deferred decl. llvm::Constant *Aliasee; - if (isa(DeclTy)) + if (isa(DeclTy)) { Aliasee = GetOrCreateLLVMFunction(AA->getAliasee(), DeclTy, GlobalDecl(), /*ForVTable=*/false); - else + // Set proper calling convention for the aliasee whose + // storage duration is static. + if (llvm::Function *F = dyn_cast(Aliasee)) { + const FunctionDecl *FD = cast(D); + const CGFunctionInfo& FI = getTypes().arrangeFunctionDeclaration(FD); + unsigned CC = FI.getEffectiveCallingConvention(); + F->setCallingConv(static_cast(CC)); + } + } else Aliasee = GetOrCreateLLVMGlobal(AA->getAliasee(), llvm::PointerType::getUnqual(DeclTy), 0); diff --git a/test/CodeGen/alias.c b/test/CodeGen/alias.c index ed90a7c..3784b35 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 { -- 1.7.11.1