r184410 - Add -fno-assume-sane-operator-new when building with MSan.

[Evgeniy Stepanov]

Author: eugenis
Date: Thu Jun 20 05:49:46 2013
New Revision: 184410

URL: http://llvm.org/viewvc/llvm-project?rev=184410&view=rev
Log:
Add -fno-assume-sane-operator-new when building with MSan.

A workaroudn for PR16386. MSan's operator new aften has side-effects that are
miscompiled without this flag.

Modified:
    cfe/trunk/lib/Driver/SanitizerArgs.h
    cfe/trunk/test/Driver/fsanitize.c

Modified: cfe/trunk/lib/Driver/SanitizerArgs.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/SanitizerArgs.h?rev=184410&r1=184409&r2=184410&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/SanitizerArgs.h (original)
+++ cfe/trunk/lib/Driver/SanitizerArgs.h Thu Jun 20 05:49:46 2013
@@ -94,8 +94,12 @@ class SanitizerArgs {
       CmdArgs.push_back(Args.MakeArgString("-fsanitize-memory-track-origins"));
 
     if (AsanZeroBaseShadow)
-      CmdArgs.push_back(Args.MakeArgString(
-          "-fsanitize-address-zero-base-shadow"));
+      CmdArgs.push_back(
+          Args.MakeArgString("-fsanitize-address-zero-base-shadow"));
+
+    // Workaround for PR16386.
+    if (needsMsanRt())
+      CmdArgs.push_back(Args.MakeArgString("-fno-assume-sane-operator-new"));
   }
 
  private:

Modified: cfe/trunk/test/Driver/fsanitize.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/fsanitize.c?rev=184410&r1=184409&r2=184410&view=diff
==============================================================================
--- cfe/trunk/test/Driver/fsanitize.c (original)
+++ cfe/trunk/test/Driver/fsanitize.c Thu Jun 20 05:49:46 2013
@@ -139,3 +139,6 @@
 
 // RUN: %clang -target x86_64-linux-gnu -fsanitize=address,leak -fno-sanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANA-SANL-NO-SANA
 // CHECK-SANA-SANL-NO-SANA: "-fsanitize=leak"
+
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-MSAN
+// CHECK-MSAN: "-fno-assume-sane-operator-new"