Chromium Code Reviews| Index: third_party/re2/util/sparse_array.h |
| diff --git a/third_party/re2/util/sparse_array.h b/third_party/re2/util/sparse_array.h |
| index 3e33f8999315d0c0e0fd3138ee70bafea2eed227..613417d6ced7e4692b14e940d49bf19ac79bf732 100644 |
| --- a/third_party/re2/util/sparse_array.h |
| +++ b/third_party/re2/util/sparse_array.h |
| @@ -231,7 +231,14 @@ class SparseArray { |
| template<typename Value> |
| SparseArray<Value>::SparseArray() |
| - : size_(0), max_size_(0), sparse_to_dense_(NULL), dense_(), valgrind_(RunningOnValgrind()) {} |
| + : size_(0), max_size_(0), sparse_to_dense_(NULL), dense_(), |
| +#if defined(MEMORY_SANITIZER) |
|
eugenis
2014/01/30 09:02:55
I think it would be cleaner to implement RunningOn
|
| + valgrind_(true) |
| +#else |
| + valgrind_(RunningOnValgrind()) |
| +#endif |
| +{ |
| +} |
| // IndexValue pairs: exposed in SparseArray::iterator. |
| template<typename Value> |
| @@ -418,7 +425,11 @@ void SparseArray<Value>::create_index(int i) { |
| template<typename Value> SparseArray<Value>::SparseArray(int max_size) { |
| max_size_ = max_size; |
| sparse_to_dense_ = new int[max_size]; |
| +#if defined(MEMORY_SANITIZER) |
| + valgrind_ = true; |
| +#else |
| valgrind_ = RunningOnValgrind(); |
| +#endif |
| dense_.resize(max_size); |
| // Don't need to zero the new memory, but appease Valgrind. |
| if (valgrind_) { |