summaryrefslogtreecommitdiffstats
path: root/compiler-rt
diff options
context:
space:
mode:
authorPetr Hosek <phosek@chromium.org>2018-01-13 00:56:28 +0000
committerPetr Hosek <phosek@chromium.org>2018-01-13 00:56:28 +0000
commitc2b340a5c625b495d5311b02f15cf124dc7ed835 (patch)
treed35de5bbb58d77c18838ddb6fe77975ef89c8cbc /compiler-rt
parentf9c63174c0e794f0792365b54a714afe0f7bd32a (diff)
downloadbcm5719-llvm-c2b340a5c625b495d5311b02f15cf124dc7ed835.tar.gz
bcm5719-llvm-c2b340a5c625b495d5311b02f15cf124dc7ed835.zip
Revert "[SanitizerCoverage][Fuchsia] Make TracePcGuardController linker-initialized"
This reverts commit r322424: this broke the tsan lint check. llvm-svn: 322428
Diffstat (limited to 'compiler-rt')
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_coverage_fuchsia.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_coverage_fuchsia.cc b/compiler-rt/lib/sanitizer_common/sanitizer_coverage_fuchsia.cc
index 4d1bbc4ea53..c5be48bceac 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_coverage_fuchsia.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_coverage_fuchsia.cc
@@ -49,7 +49,7 @@ constexpr const char kSancovSinkName[] = "sancov";
// Collects trace-pc guard coverage.
// This class relies on zero-initialization.
-class TracePcGuardController final {
+class TracePcGuardController {
public:
// For each PC location being tracked, there is a u32 reserved in global
// data called the "guard". At startup, we assign each guard slot a
@@ -113,11 +113,11 @@ class TracePcGuardController final {
// We can always spare the 32G of address space.
static constexpr size_t MappingSize = sizeof(uptr) << 32;
- BlockingMutex setup_lock_{LINKER_INITIALIZED};
- uptr *array_{};
- u32 next_index_{};
- zx_handle_t vmo_{};
- char vmo_name_[ZX_MAX_NAME_LEN]{};
+ BlockingMutex setup_lock_;
+ uptr *array_;
+ u32 next_index_;
+ zx_handle_t vmo_;
+ char vmo_name_[ZX_MAX_NAME_LEN];
size_t DataSize() const { return next_index_ * sizeof(uintptr_t); }
OpenPOWER on IntegriCloud