[llvm] r303783 - Revert "Attempt to pacify ASan and UBSan reports in CrashRecovery tests"

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Wed May 24 12:58:09 2017
New Revision: 303783

URL: http://llvm.org/viewvc/llvm-project?rev=303783&view=rev
Log:
Revert "Attempt to pacify ASan and UBSan reports in CrashRecovery tests"

It's not needed after r303729.

This reverts commit r303311.

Modified:
    llvm/trunk/unittests/Support/CrashRecoveryTest.cpp

Modified: llvm/trunk/unittests/Support/CrashRecoveryTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/CrashRecoveryTest.cpp?rev=303783&r1=303782&r2=303783&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/CrashRecoveryTest.cpp (original)
+++ llvm/trunk/unittests/Support/CrashRecoveryTest.cpp Wed May 24 12:58:09 2017
@@ -17,15 +17,11 @@
 #include <windows.h>
 #endif
 
-extern "C" const char *__asan_default_options() {
-  return "allow_user_segv_handler=1";
-}
-
 using namespace llvm;
 using namespace llvm::sys;
 
 static int GlobalInt = 0;
-static void nullDeref() { *(volatile int *)0x10 = 0; }
+static void nullDeref() { *(volatile int *)nullptr = 0; }
 static void incrementGlobal() { ++GlobalInt; }
 static void llvmTrap() { LLVM_BUILTIN_TRAP; }