[llvm-commits] [llvm] r144933 - in /llvm/trunk: lib/Transforms/Instrumentation/AddressSanitizer.cpp test/Instrumentation/AddressSanitizer/do-not-touch-odr-global.ll

[Francois Pichet]

On Thu, Nov 17, 2011 at 6:15 PM, Kostya Serebryany <kcc at google.com> wrote:
> Author: kcc
> Date: Thu Nov 17 17:14:59 2011
> New Revision: 144933
>
> URL: http://llvm.org/viewvc/llvm-project?rev=144933&view=rev
> Log:
> fall back to explicit list of allowed linkages when instrumenting globals in asan; add a test check that asan does not touch linkonce_odr
>
> Added:
>    llvm/trunk/test/Instrumentation/AddressSanitizer/do-not-touch-odr-global.ll
> Modified:
>    llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
>
> Modified: llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=144933&r1=144932&r2=144933&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp (original)
> +++ llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp Thu Nov 17 17:14:59 2011
> @@ -448,8 +448,11 @@
>
>     if (!Ty->isSized()) continue;
>     if (!G->hasInitializer()) continue;
> -    if (GlobalVariable::mayBeOverridden(G->getLinkage()) ||
> -        G->getLinkage() == GlobalVariable::AppendingLinkage)
> +    // Touch only those globals that will not be defined in other modules.
> +    // Don't handle ODR type linkages since other modules may be built w/o asan.
> +    if (G->getLinkage() != GlobalVariable::GlobalVariable::ExternalLinkage &&
> +        G->getLinkage() != GlobalVariable::GlobalVariable::PrivateLinkage &&
> +        G->getLinkage() != GlobalVariable::GlobalVariable::InternalLinkage)

GlobalVariable::GlobalVariable?
I don't know if that's valid but MSVC doesn't like it.