diff options
| -rw-r--r-- | llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/Instrumentation/AddressSanitizer/global_addrspace.ll | 31 |
2 files changed, 33 insertions, 0 deletions
diff --git a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp index d92ee11c2e1..554def59af1 100644 --- a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp @@ -1808,6 +1808,8 @@ bool ModuleAddressSanitizer::ShouldInstrumentGlobal(GlobalVariable *G) { if (GlobalsMD.get(G).IsBlacklisted) return false; if (!Ty->isSized()) return false; if (!G->hasInitializer()) return false; + // Only instrument globals of default address spaces + if (G->getAddressSpace()) return false; if (GlobalWasGeneratedByCompiler(G)) return false; // Our own globals. // Two problems with thread-locals: // - The address of the main thread's copy can't be computed at link-time. diff --git a/llvm/test/Instrumentation/AddressSanitizer/global_addrspace.ll b/llvm/test/Instrumentation/AddressSanitizer/global_addrspace.ll new file mode 100644 index 00000000000..19b76e65125 --- /dev/null +++ b/llvm/test/Instrumentation/AddressSanitizer/global_addrspace.ll @@ -0,0 +1,31 @@ +; Only verify that asan don't crash on global variables of different +; address space. The global variable should be unmodified by asan. + +; RUN: opt < %s -asan -asan-module -S | FileCheck %s + +target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +@a = internal addrspace(42) global [1 x i32] zeroinitializer, align 4 + +; CHECK: @a = internal addrspace(42) global [1 x i32] zeroinitializer, align 4 + +define void @b(i32 %c) { +entry: + %conv = sext i32 %c to i64 + %0 = inttoptr i64 %conv to i32 addrspace(42)* + %cmp = icmp ugt i32 addrspace(42)* %0, getelementptr inbounds ([1 x i32], [1 x i32] addrspace(42)* @a, i64 0, i64 0) + br i1 %cmp, label %if.then, label %if.end + +if.then: + %call = tail call i32 (...) @e() + br label %if.end + +if.end: + ret void +} + +declare i32 @e(...) + +!llvm.asan.globals = !{!0} +!0 = !{[1 x i32] addrspace(42)* @a, null, !"a", i1 false, i1 false} |
