Author: Fangrui Song Date: 2020-12-05T21:36:31-08:00 New Revision: 204d0d51b3cec91696f8b0b03f204cd0cf8d5ed4
URL: https://github.com/llvm/llvm-project/commit/204d0d51b3cec91696f8b0b03f204cd0cf8d5ed4 DIFF: https://github.com/llvm/llvm-project/commit/204d0d51b3cec91696f8b0b03f204cd0cf8d5ed4.diff LOG: [MemProf] Make __memprof_shadow_memory_dynamic_address dso_local in static relocation model The x86-64 backend currently has a bug which uses a wrong register when for the GOTPCREL reference. The program will crash without the dso_local specifier. Added: llvm/test/Instrumentation/HeapProfiler/shadow.ll Modified: llvm/lib/Transforms/Instrumentation/MemProfiler.cpp Removed: ################################################################################ diff --git a/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp b/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp index 32fd11a258fa..56006bbc94c7 100644 --- a/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp +++ b/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp @@ -576,6 +576,8 @@ bool MemProfiler::insertDynamicShadowAtFunctionEntry(Function &F) { IRBuilder<> IRB(&F.front().front()); Value *GlobalDynamicAddress = F.getParent()->getOrInsertGlobal( MemProfShadowMemoryDynamicAddress, IntptrTy); + if (F.getParent()->getPICLevel() == PICLevel::NotPIC) + dyn_cast<GlobalVariable>(GlobalDynamicAddress)->setDSOLocal(true); DynamicShadowOffset = IRB.CreateLoad(IntptrTy, GlobalDynamicAddress); return true; } diff --git a/llvm/test/Instrumentation/HeapProfiler/shadow.ll b/llvm/test/Instrumentation/HeapProfiler/shadow.ll new file mode 100644 index 000000000000..4472f3d33a0f --- /dev/null +++ b/llvm/test/Instrumentation/HeapProfiler/shadow.ll @@ -0,0 +1,14 @@ +; RUN: opt < %s -passes='function(memprof),module(memprof-module)' -S | FileCheck --check-prefixes=STATIC %s + +; RUN: cp %s %t.pic.ll +; RUN: echo -e '!llvm.module.flags = !{!0}\n!0 = !{i32 7, !"PIC Level", i32 1}' >> %t.pic.ll +; RUN: opt < %t.pic.ll -passes='function(memprof),module(memprof-module)' -S | FileCheck --check-prefixes=PIC %s + +; STATIC: @__memprof_shadow_memory_dynamic_address = external dso_local global i64 +; PIC: @__memprof_shadow_memory_dynamic_address = external global i64 + +define i32 @test_load(i32* %a) { +entry: + %tmp1 = load i32, i32* %a, align 4 + ret i32 %tmp1 +} _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
