[llvm-commits] [llvm] r159136 - in /llvm/trunk: include/llvm/GlobalValue.h lib/Transforms/IPO/GlobalOpt.cpp test/Transforms/GlobalOpt/hidden.ll

[David Dean]

I'm seeing a link-time failure after this change with one of the SPEC tests when building with -O3 or Os. (447.dealII)
ld: bad codegen, pointer diff in __ZNK22AutoDerivativeFunctionILi1EE15vector_gradientERK5PointILi1EERSt6vectorI6TensorILi1ELi1EESaIS7_EE to global weak symbol __ZTV6VectorIdE for architecture i386

Can you take a look?

On 25 Jun 2012, at 7:30 AM, Rafael Espindola wrote:

> Author: rafael
> Date: Mon Jun 25 09:30:31 2012
> New Revision: 159136
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=159136&view=rev
> Log:
> If a constant or a function has linkonce_odr linkage and unnamed_addr, mark it
> hidden. Being linkonce_odr guarantees that it is available in every dso that
> needs it. Being a constant/function with unnamed_addr guarantees that the
> copies don't have to be merged.
> 
> Added:
>    llvm/trunk/test/Transforms/GlobalOpt/hidden.ll
> Modified:
>    llvm/trunk/include/llvm/GlobalValue.h
>    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
> 
> Modified: llvm/trunk/include/llvm/GlobalValue.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/GlobalValue.h?rev=159136&r1=159135&r2=159136&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/GlobalValue.h (original)
> +++ llvm/trunk/include/llvm/GlobalValue.h Mon Jun 25 09:30:31 2012
> @@ -122,6 +122,9 @@
>   static bool isAvailableExternallyLinkage(LinkageTypes Linkage) {
>     return Linkage == AvailableExternallyLinkage;
>   }
> +  static bool isLinkOnceODRLinkage(LinkageTypes Linkage) {
> +    return Linkage == LinkOnceODRLinkage;
> +  }
>   static bool isLinkOnceLinkage(LinkageTypes Linkage) {
>     return Linkage == LinkOnceAnyLinkage || Linkage == LinkOnceODRLinkage;
>   }
> @@ -202,6 +205,9 @@
>   bool hasAvailableExternallyLinkage() const {
>     return isAvailableExternallyLinkage(Linkage);
>   }
> +  bool hasLinkOnceODRLinkage() const {
> +    return isLinkOnceODRLinkage(Linkage);
> +  }
>   bool hasLinkOnceLinkage() const {
>     return isLinkOnceLinkage(Linkage);
>   }
> 
> Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=159136&r1=159135&r2=159136&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Mon Jun 25 09:30:31 2012
> @@ -1731,6 +1731,12 @@
>     return true;
>   }
> 
> +  if (GV->hasLinkOnceODRLinkage() && GV->hasUnnamedAddr() && GV->isConstant() &&
> +      GV->getVisibility() != GlobalValue::HiddenVisibility) {
> +    GV->setVisibility(GlobalValue::HiddenVisibility);
> +    return true;
> +  }
> +
>   if (!GV->hasLocalLinkage())
>     return false;
> 
> @@ -1743,6 +1749,7 @@
>   if (!GS.isCompared && !GV->hasUnnamedAddr()) {
>     GV->setUnnamedAddr(true);
>     NumUnnamed++;
> +    return true;
>   }
> 
>   if (GV->isConstant() || !GV->hasInitializer())
> @@ -1917,6 +1924,10 @@
>       F->eraseFromParent();
>       Changed = true;
>       ++NumFnDeleted;
> +    } else if (F->hasLinkOnceODRLinkage() && F->hasUnnamedAddr() &&
> +               F->getVisibility() != GlobalValue::HiddenVisibility) {
> +      F->setVisibility(GlobalValue::HiddenVisibility);
> +      Changed = true;
>     } else if (F->hasLocalLinkage()) {
>       if (F->getCallingConv() == CallingConv::C && !F->isVarArg() &&
>           !F->hasAddressTaken()) {
> 
> Added: llvm/trunk/test/Transforms/GlobalOpt/hidden.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/hidden.ll?rev=159136&view=auto
> ==============================================================================
> --- llvm/trunk/test/Transforms/GlobalOpt/hidden.ll (added)
> +++ llvm/trunk/test/Transforms/GlobalOpt/hidden.ll Mon Jun 25 09:30:31 2012
> @@ -0,0 +1,14 @@
> +; RUN: opt %s -globalopt -S | FileCheck %s
> +
> + at foo = linkonce_odr unnamed_addr constant i32 42
> +; CHECK: @foo = linkonce_odr hidden unnamed_addr constant i32 42
> +
> +define linkonce_odr void @bar() unnamed_addr {
> +; CHECK: define linkonce_odr hidden void @bar() unnamed_addr {
> +  ret void
> +}
> +
> +define i32* @zed() {
> +  call void @bar()
> +  ret i32* @foo
> +}
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

-David