[llvm] r327055 - Revert r327053.

[Kuba Mracek via llvm-commits]

Author: kuba.brecka
Date: Thu Mar  8 12:13:39 2018
New Revision: 327055

URL: http://llvm.org/viewvc/llvm-project?rev=327055&view=rev
Log:
Revert r327053.


Removed:
    llvm/trunk/test/Instrumentation/AddressSanitizer/global_lto_merge.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=327055&r1=327054&r2=327055&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp Thu Mar  8 12:13:39 2018
@@ -2158,13 +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 *>(
-                           reinterpret_cast<GlobalValue **>(NewGlobals.data()),
-                           NewGlobals.size()));
-
   std::string ELFUniqueModuleId =
       (UseGlobalsGC && TargetTriple.isOSBinFormatELF()) ? getUniqueModuleId(&M)
                                                         : "";

Removed: 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=327054&view=auto
==============================================================================
--- llvm/trunk/test/Instrumentation/AddressSanitizer/global_lto_merge.ll (original)
+++ llvm/trunk/test/Instrumentation/AddressSanitizer/global_lto_merge.ll (removed)
@@ -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)