[llvm] r327033 - Revert r327029

[David Zarzycki via llvm-commits]

FYI – This revert is incomplete. It left an empty (rather than removed) test file, which causes the test suite to fail.


> On Mar 8, 2018, at 12:32, Kuba Mracek via llvm-commits <llvm-commits at lists.llvm.org> wrote:
> 
> Author: kuba.brecka
> Date: Thu Mar  8 09:32:00 2018
> New Revision: 327033
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=327033&view=rev
> Log:
> Revert r327029
> 
> 
> Modified:
>    llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
>    llvm/trunk/test/Instrumentation/AddressSanitizer/global_lto_merge.ll
> 
> Modified: llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=327033&r1=327032&r2=327033&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp (original)
> +++ llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp Thu Mar  8 09:32:00 2018
> @@ -2158,12 +2158,6 @@ bool AddressSanitizerModule::InstrumentG
>     Initializers[i] = Initializer;
>   }
> 
> -  // Add instrumented globals to llvm.compiler.used list to avoid LTO from
> -  // ConstantMerge'ing them.
> -  appendToCompilerUsed(
> -      M, ArrayRef<GlobalValue *>(cast<GlobalValue *>(NewGlobals.data()),
> -                                 NewGlobals.size()));
> -
>   std::string ELFUniqueModuleId =
>       (UseGlobalsGC && TargetTriple.isOSBinFormatELF()) ? getUniqueModuleId(&M)
>                                                         : "";
> 
> Modified: llvm/trunk/test/Instrumentation/AddressSanitizer/global_lto_merge.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/AddressSanitizer/global_lto_merge.ll?rev=327033&r1=327032&r2=327033&view=diff
> ==============================================================================
> --- llvm/trunk/test/Instrumentation/AddressSanitizer/global_lto_merge.ll (original)
> +++ llvm/trunk/test/Instrumentation/AddressSanitizer/global_lto_merge.ll Thu Mar  8 09:32:00 2018
> @@ -1,30 +0,0 @@
> -; RUN: opt < %s -asan -asan-module -S | FileCheck %s
> -; RUN: opt < %s -asan -asan-module -constmerge -S | FileCheck %s
> -
> -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
> -target triple = "x86_64-apple-macosx10.11.0"
> -
> -%struct = type { i64, i64 }
> -
> - at a = private unnamed_addr constant %struct { i64 16, i64 16 }, align 8
> - at b = private unnamed_addr constant %struct { i64 16, i64 16 }, align 8
> -
> -; CHECK: @a = {{.*}} %struct
> -; CHECK: @b = {{.*}} %struct
> -
> -; CHECK: @llvm.compiler.used =
> -; CHECK-SAME: i8* bitcast ({ %struct, [48 x i8] }* @a to i8*)
> -; CHECK-SAME: i8* bitcast ({ %struct, [48 x i8] }* @b to i8*)
> -
> -define i32 @main(i32, i8** nocapture readnone) {
> -  %3 = alloca %struct, align 8
> -  %4 = alloca %struct, align 8
> -  %5 = bitcast %struct* %3 to i8*
> -  call void @llvm.memcpy.p0i8.p0i8.i64(i8* nonnull %5, i8* bitcast (%struct* @a to i8*), i64 16, i32 8, i1 false)
> -  %6 = bitcast %struct* %4 to i8*
> -  call void @llvm.memcpy.p0i8.p0i8.i64(i8* nonnull %6, i8* bitcast (%struct* @b to i8*), i64 16, i32 8, i1 false)
> -  call void asm sideeffect "", "r,r,~{dirflag},~{fpsr},~{flags}"(%struct* nonnull %3, %struct* nonnull %4)
> -  ret i32 0
> -}
> -
> -declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture writeonly, i8* nocapture readonly, i64, i32, i1)
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits