From: Kostya Serebryany <kcc@google.com>
Date: Tue, 20 Sep 2016 00:16:54 +0000 (+0000)
Subject: [sanitizer-coverage] add comdat to coverage guards if needed
X-Git-Tag: llvmorg-4.0.0-rc1~9351
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06694d0a2f487c5fc59dd8e2d76366d97598abfb;p=platform%2Fupstream%2Fllvm.git

[sanitizer-coverage] add comdat to coverage guards if needed

llvm-svn: 281952
---

diff --git a/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp b/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp
index a2755ad..9e1ff1c 100644
--- a/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp
+++ b/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp
@@ -669,6 +669,8 @@ void SanitizerCoverageModule::InjectCoverageAtBlock(Function &F, BasicBlock &BB,
     auto GuardVar = new GlobalVariable(
         *F.getParent(), Int64Ty, false, GlobalVariable::LinkOnceODRLinkage,
         Constant::getNullValue(Int64Ty), "__sancov_guard." + F.getName());
+    if (auto Comdat = F.getComdat())
+      GuardVar->setComdat(Comdat);
     // TODO: add debug into to GuardVar.
     GuardVar->setSection(SanCovTracePCGuardSection);
     auto GuardPtr = IRB.CreatePointerCast(GuardVar, IntptrPtrTy);
diff --git a/llvm/test/Instrumentation/SanitizerCoverage/tracing-comdat.ll b/llvm/test/Instrumentation/SanitizerCoverage/tracing-comdat.ll
new file mode 100644
index 0000000..f718af5
--- /dev/null
+++ b/llvm/test/Instrumentation/SanitizerCoverage/tracing-comdat.ll
@@ -0,0 +1,13 @@
+; Test that the coverage guards have proper comdat
+; RUN: opt < %s -sancov -sanitizer-coverage-level=3 -sanitizer-coverage-trace-pc-guard  -S | FileCheck %s
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+$Foo = comdat any
+; Function Attrs: uwtable
+define linkonce_odr void @Foo() comdat {
+entry:
+  ret void
+}
+
+; CHECK: @__sancov_guard.Foo = linkonce_odr global i64 0, section "__sancov_guards", comdat($Foo)
+