commit 543f3db572d0a920faeae784987ad3d57f4bfa07
author Kostya Serebryany <kcc@google.com> Wed Dec 03 23:28:26 2014 +0000
committer Kostya Serebryany <kcc@google.com> Wed Dec 03 23:28:26 2014 +0000
tree aed7f74e6560818bceb9adf5bdd90d7b7ff17872
parent bed8da2e3b6505375155e6ae9568d912cdb223d1

[msan] allow -fsanitize-coverage=N together with -fsanitize=memory, llvm part

llvm-svn: 223312

llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp

diff --git a/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
index d973326..35f9fd7 100644
--- a/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
+++ b/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
@@ -1036,7 +1036,7 @@
     IRBuilder<> IRB(I.getNextNode());
     Type *ShadowTy = getShadowTy(&I);
     Value *Addr = I.getPointerOperand();
-    if (PropagateShadow) {
+    if (PropagateShadow && !I.getMetadata("nosanitize")) {
       Value *ShadowPtr = getShadowPtr(Addr, ShadowTy, IRB);
       setShadow(&I,
                 IRB.CreateAlignedLoad(ShadowPtr, I.getAlignment(), "_msld"));