[lld] r268411 - ELF: Fix regression in TLS attribute mismatch logic.

[Rafael Espíndola via llvm-commits]

Thanks!

On 3 May 2016 at 14:03, Peter Collingbourne via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: pcc
> Date: Tue May  3 13:03:47 2016
> New Revision: 268411
>
> URL: http://llvm.org/viewvc/llvm-project?rev=268411&view=rev
> Log:
> ELF: Fix regression in TLS attribute mismatch logic.
>
> Introduce a special symbol type to indicate that we have not yet seen a type
> for the symbol, so we should not report TLS mismatches for that symbol.
>
> Differential Revision: http://reviews.llvm.org/D19836
>
> Added:
>     lld/trunk/test/ELF/tls-archive.s
> Modified:
>     lld/trunk/ELF/SymbolTable.cpp
>     lld/trunk/ELF/Symbols.h
>
> Modified: lld/trunk/ELF/SymbolTable.cpp
> URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=268411&r1=268410&r2=268411&view=diff
> ==============================================================================
> --- lld/trunk/ELF/SymbolTable.cpp (original)
> +++ lld/trunk/ELF/SymbolTable.cpp Tue May  3 13:03:47 2016
> @@ -209,7 +209,8 @@ SymbolTable<ELFT>::insert(StringRef Name
>      S->ExportDynamic = true;
>    if (IsUsedInRegularObj)
>      S->IsUsedInRegularObj = true;
> -  if (!WasInserted && ((Type == STT_TLS) != S->body()->isTls()))
> +  if (!WasInserted && S->body()->Type != SymbolBody::UnknownType &&
> +      ((Type == STT_TLS) != S->body()->isTls()))
>      error("TLS attribute mismatch for symbol: " +
>            conflictMsg(S->body(), File));
>
> @@ -436,7 +437,7 @@ void SymbolTable<ELFT>::addLazyArchive(
>    bool WasInserted;
>    std::tie(S, WasInserted) = insert(Sym.getName());
>    if (WasInserted) {
> -    replaceBody<LazyArchive>(S, F, Sym, STT_NOTYPE);
> +    replaceBody<LazyArchive>(S, F, Sym, SymbolBody::UnknownType);
>      return;
>    }
>    if (!S->body()->isUndefined())
> @@ -464,7 +465,7 @@ void SymbolTable<ELFT>::addLazyObject(St
>    bool WasInserted;
>    std::tie(S, WasInserted) = insert(Name);
>    if (WasInserted) {
> -    replaceBody<LazyObject>(S, Name, MBRef, STT_NOTYPE);
> +    replaceBody<LazyObject>(S, Name, MBRef, SymbolBody::UnknownType);
>      return;
>    }
>    if (!S->body()->isUndefined())
>
> Modified: lld/trunk/ELF/Symbols.h
> URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.h?rev=268411&r1=268410&r2=268411&view=diff
> ==============================================================================
> --- lld/trunk/ELF/Symbols.h (original)
> +++ lld/trunk/ELF/Symbols.h Tue May  3 13:03:47 2016
> @@ -131,6 +131,13 @@ public:
>    uint8_t Type;    // symbol type
>    uint8_t StOther; // st_other field value
>
> +  // The Type field may also have this value. It means that we have not yet seen
> +  // a non-Lazy symbol with this name, so we don't know what its type is. The
> +  // Type field is normally set to this value for Lazy symbols unless we saw a
> +  // weak undefined symbol first, in which case we need to remember the original
> +  // symbol's type in order to check for TLS mismatches.
> +  enum { UnknownType = 255 };
> +
>    bool isSection() const { return Type == llvm::ELF::STT_SECTION; }
>    bool isTls() const { return Type == llvm::ELF::STT_TLS; }
>    bool isFunc() const { return Type == llvm::ELF::STT_FUNC; }
>
> Added: lld/trunk/test/ELF/tls-archive.s
> URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-archive.s?rev=268411&view=auto
> ==============================================================================
> --- lld/trunk/test/ELF/tls-archive.s (added)
> +++ lld/trunk/test/ELF/tls-archive.s Tue May  3 13:03:47 2016
> @@ -0,0 +1,10 @@
> +// REQUIRES: x86
> +// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
> +// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/tls-mismatch.s -o %t2
> +// RUN: rm -f %t.a
> +// RUN: llvm-ar cru %t.a %t2
> +// RUN: ld.lld %t.a %t -o %t3
> +
> +.globl _start,tlsvar
> +_start:
> +  movl tlsvar at GOTTPOFF(%rip),%edx
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits