diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-02 15:38:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-02 15:38:37 +0200 |
| commit | 7658e459de6e60dfe0f3246bf3708e9235dede46 (patch) | |
| tree | 93c966efe51acaec157d4eb0d7ef25ac2852269a /vespamalloc | |
| parent | 17949937fd6180b8ddf1fee5b4f4fbfb9cf2f43f (diff) | |
| parent | f147b502d0f00cd3c032e65d9e25557ac8fb3f8b (diff) | |
Merge pull request #10174 from vespa-engine/toregge/adjust-vespamalloc-crash-hack
Adjust crash hack in vespamalloc.
Diffstat (limited to 'vespamalloc')
| -rw-r--r-- | vespamalloc/src/vespamalloc/malloc/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vespamalloc/src/vespamalloc/malloc/common.h b/vespamalloc/src/vespamalloc/malloc/common.h index 9cc3d319e59..b21a2f63ed5 100644 --- a/vespamalloc/src/vespamalloc/malloc/common.h +++ b/vespamalloc/src/vespamalloc/malloc/common.h @@ -74,7 +74,7 @@ public: static inline size_t classSize(SizeClassT sc) { return (size_t(1) << (sc + MinClassSizeC)); } }; -inline void crash() { *((unsigned *) NULL) = 0; } +inline void crash() { *((volatile unsigned *) NULL) = 0; } template <typename T> inline void swap(T & a, T & b) { T tmp(a); a = b; b = tmp; } |