summaryrefslogtreecommitdiffstats
path: root/llvm/unittests/Support/CrashRecoveryTest.cpp
diff options
context:
space:
mode:
authorVitaly Buka <vitalybuka@google.com>2017-05-24 17:58:09 +0000
committerVitaly Buka <vitalybuka@google.com>2017-05-24 17:58:09 +0000
commitc98741c79e83ee64592fb82b9577119958793d80 (patch)
tree4d416f37e71591d13c03df5055d4d9f5afac75c6 /llvm/unittests/Support/CrashRecoveryTest.cpp
parentcd2aa0d2e45cc4159c73daeed0ae7d4ae4c040a3 (diff)
downloadbcm5719-llvm-c98741c79e83ee64592fb82b9577119958793d80.tar.gz
bcm5719-llvm-c98741c79e83ee64592fb82b9577119958793d80.zip
Revert "Attempt to pacify ASan and UBSan reports in CrashRecovery tests"
It's not needed after r303729. This reverts commit r303311. llvm-svn: 303783
Diffstat (limited to 'llvm/unittests/Support/CrashRecoveryTest.cpp')
-rw-r--r--llvm/unittests/Support/CrashRecoveryTest.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/llvm/unittests/Support/CrashRecoveryTest.cpp b/llvm/unittests/Support/CrashRecoveryTest.cpp
index 33d87a1c0e4..dbb0db57679 100644
--- a/llvm/unittests/Support/CrashRecoveryTest.cpp
+++ b/llvm/unittests/Support/CrashRecoveryTest.cpp
@@ -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; }
OpenPOWER on IntegriCloud