[llvm] r201625 - Now that llvm always does the right thing with private, use it.

[Alexander Potapenko]

Rafael, did you run `make check-asan` on Darwin?
projects/compiler-rt/test/asan/TestCases/Darwin/asan_gen_prefixes.cc
fails for me now, because it's looking for an "l"-prefixed global in
__TEXT,__const, but ASan makes it an "L"-prefixed one.
According to http://llvm.org/bugs/show_bug.cgi?id=17976#c10 it's not correct.

On Wed, Feb 19, 2014 at 6:08 AM, Rafael Espindola
<rafael.espindola at gmail.com> wrote:
> Author: rafael
> Date: Tue Feb 18 20:08:39 2014
> New Revision: 201625
>
> URL: http://llvm.org/viewvc/llvm-project?rev=201625&view=rev
> Log:
> Now that llvm always does the right thing with private, use it.
>
> Modified:
>     llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
>     llvm/trunk/test/Instrumentation/AddressSanitizer/instrument_global.ll
>
> Modified: llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=201625&r1=201624&r2=201625&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp (original)
> +++ llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp Tue Feb 18 20:08:39 2014
> @@ -561,19 +561,13 @@ static size_t TypeSizeToSizeIndex(uint32
>  static GlobalVariable *createPrivateGlobalForString(
>      Module &M, StringRef Str, bool AllowMerging) {
>    Constant *StrConst = ConstantDataArray::getString(M.getContext(), Str);
> -  // For module-local strings that can be merged with another one we set the
> -  // private linkage and the unnamed_addr attribute.
> -  // Non-mergeable strings are made linker_private to remove them from the
> -  // symbol table. "private" linkage doesn't work for Darwin, where the
> -  // "L"-prefixed globals  end up in __TEXT,__const section
> -  // (see http://llvm.org/bugs/show_bug.cgi?id=17976 for more info).
> -  GlobalValue::LinkageTypes linkage =
> -      AllowMerging ? GlobalValue::PrivateLinkage
> -                   : GlobalValue::LinkerPrivateLinkage;
> +  // We use private linkage for module-local strings. If they can be merged
> +  // with another one, we set the unnamed_addr attribute.
>    GlobalVariable *GV =
>        new GlobalVariable(M, StrConst->getType(), true,
> -                         linkage, StrConst, kAsanGenPrefix);
> -  if (AllowMerging) GV->setUnnamedAddr(true);
> +                         GlobalValue::PrivateLinkage, StrConst, kAsanGenPrefix);
> +  if (AllowMerging)
> +    GV->setUnnamedAddr(true);
>    GV->setAlignment(1);  // Strings may not be merged w/o setting align 1.
>    return GV;
>  }
>
> Modified: llvm/trunk/test/Instrumentation/AddressSanitizer/instrument_global.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/AddressSanitizer/instrument_global.ll?rev=201625&r1=201624&r2=201625&view=diff
> ==============================================================================
> --- llvm/trunk/test/Instrumentation/AddressSanitizer/instrument_global.ll (original)
> +++ llvm/trunk/test/Instrumentation/AddressSanitizer/instrument_global.ll Tue Feb 18 20:08:39 2014
> @@ -7,6 +7,7 @@ target triple = "x86_64-unknown-linux-gn
>  ; module ctor/dtor
>
>  ; CHECK: llvm.global_ctors
> +; CHECK: @__asan_gen_ = private constant [8 x i8] c"<stdin>\00", align 1
>  ; CHECK: llvm.global_dtors
>
>  ; Test that we don't instrument global arrays with static initializer
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



-- 
Alexander Potapenko
Software Engineer
Google Moscow