[cfe-commits] [PATCH] [msan] Support -fsanitize=memory,origins
Evgeniy Stepanov
eugenis at google.com
Wed Dec 19 06:08:20 PST 2012
Hi kcc,
This patch adds clang support for origins tracking in MemorySanitizer, which is now accessible through -mllvm -msan-track-origins=1.
http://llvm-reviews.chandlerc.com/D224
Files:
test/Driver/fsanitize.c
include/clang/Basic/Sanitizers.def
lib/CodeGen/BackendUtil.cpp
lib/Driver/SanitizerArgs.h
lib/Driver/Tools.cpp
Index: test/Driver/fsanitize.c
===================================================================
--- test/Driver/fsanitize.c
+++ test/Driver/fsanitize.c
@@ -11,31 +11,43 @@
// RUN: %clang -target x86_64-linux-gnu -fsanitize=address-full %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-ASAN-FULL
// CHECK-ASAN-FULL: "-fsanitize={{((address|init-order|use-after-return|use-after-scope),?){4}"}}
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=memory-full -pie %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-MSAN-FULL
+// CHECK-MSAN-FULL: "-fsanitize={{((memory|origins),?){2}"}}
+
// RUN: %clang -target x86_64-linux-gnu -fsanitize=vptr -fno-rtti %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-VPTR-NO-RTTI
// RUN: %clang -target x86_64-linux-gnu -fsanitize=undefined -fno-rtti %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-VPTR-NO-RTTI
// CHECK-VPTR-NO-RTTI: '-fsanitize=vptr' not allowed with '-fno-rtti'
// RUN: %clang -target x86_64-linux-gnu -fsanitize=address,thread -fno-rtti %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANA-SANT
// CHECK-SANA-SANT: '-fsanitize=address' not allowed with '-fsanitize=thread'
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=address,memory -fno-rtti %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANA-SANM
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=address,memory -pie -fno-rtti %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANA-SANM
// CHECK-SANA-SANM: '-fsanitize=address' not allowed with '-fsanitize=memory'
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=thread,memory -fno-rtti %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANT-SANM
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=thread,memory -pie -fno-rtti %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANT-SANM
// CHECK-SANT-SANM: '-fsanitize=thread' not allowed with '-fsanitize=memory'
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=memory,thread -fno-rtti %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANM-SANT
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=memory,thread -pie -fno-rtti %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANM-SANT
// CHECK-SANM-SANT: '-fsanitize=thread' not allowed with '-fsanitize=memory'
// RUN: %clang -target x86_64-linux-gnu -faddress-sanitizer -fthread-sanitizer -fno-rtti %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-ASAN-TSAN
// CHECK-ASAN-TSAN: '-faddress-sanitizer' not allowed with '-fthread-sanitizer'
// RUN: %clang -target x86_64-linux-gnu -fsanitize=init-order %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-ONLY-EXTRA-ASAN
// CHECK-ONLY-EXTRA-ASAN: argument '-fsanitize=init-order' only allowed with '-fsanitize=address'
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=origins -pie %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-ONLY-EXTRA-MSAN
+// CHECK-ONLY-EXTRA-MSAN: argument '-fsanitize=origins' only allowed with '-fsanitize=memory'
+
// RUN: %clang -target x86_64-linux-gnu -fsanitize=address -fsanitize=alignment -fsanitize=vptr -fno-sanitize=vptr %s -### 2>&1
// OK
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=memory -pie %s -### 2>&1
+// OK
+
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=memory,origins -pie %s -### 2>&1
+// OK
+
// RUN: %clang -target x86_64-linux-gnu -fsanitize=vptr -fno-sanitize=vptr -fsanitize=undefined,address %s -### 2>&1
// OK
Index: include/clang/Basic/Sanitizers.def
===================================================================
--- include/clang/Basic/Sanitizers.def
+++ include/clang/Basic/Sanitizers.def
@@ -50,6 +50,8 @@
// MemorySanitizer
SANITIZER("memory", Memory)
+SANITIZER("origins", Origins)
+SANITIZER_GROUP("memory-full", MemoryFull, Memory | Origins)
// ThreadSanitizer
SANITIZER("thread", Thread)
Index: lib/CodeGen/BackendUtil.cpp
===================================================================
--- lib/CodeGen/BackendUtil.cpp
+++ lib/CodeGen/BackendUtil.cpp
@@ -188,7 +188,10 @@
static void addMemorySanitizerPass(const PassManagerBuilder &Builder,
PassManagerBase &PM) {
- PM.add(createMemorySanitizerPass());
+ const PassManagerBuilderWrapper &BuilderWrapper =
+ static_cast<const PassManagerBuilderWrapper&>(Builder);
+ const LangOptions &LangOpts = BuilderWrapper.getLangOpts();
+ PM.add(createMemorySanitizerPass(LangOpts.SanitizeOrigins));
}
static void addThreadSanitizerPass(const PassManagerBuilder &Builder,
Index: lib/Driver/SanitizerArgs.h
===================================================================
--- lib/Driver/SanitizerArgs.h
+++ lib/Driver/SanitizerArgs.h
@@ -35,7 +35,7 @@
#include "clang/Basic/Sanitizers.def"
NeedsAsanRt = AddressFull,
NeedsTsanRt = Thread,
- NeedsMsanRt = Memory,
+ NeedsMsanRt = MemoryFull,
NeedsUbsanRt = (Undefined & ~Bounds) | Integer
};
unsigned Kind;
Index: lib/Driver/Tools.cpp
===================================================================
--- lib/Driver/Tools.cpp
+++ lib/Driver/Tools.cpp
@@ -1479,6 +1479,13 @@
<< lastArgumentForKind(D, Args, NeedsAsanRt)
<< "-fsanitize=address";
+ // If -fsanitize contains extra features of MSan, it should also
+ // explicitly contain -fsanitize=memory.
+ if (NeedsMsan && ((Kind & Memory) == 0))
+ D.Diag(diag::err_drv_argument_only_allowed_with)
+ << lastArgumentForKind(D, Args, NeedsMsanRt)
+ << "-fsanitize=memory";
+
// Parse -f(no-)sanitize-blacklist options.
if (Arg *BLArg = Args.getLastArg(options::OPT_fsanitize_blacklist,
options::OPT_fno_sanitize_blacklist)) {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D224.1.patch
Type: text/x-patch
Size: 5583 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20121219/8d49dd65/attachment.bin>
More information about the cfe-commits
mailing list