From b6837f0350ff66c13582b0e94178dd5ca283ff0a Mon Sep 17 00:00:00 2001 From: Alex Light Date: Thu, 12 Nov 2020 17:05:28 +0000 Subject: Revert^2 "Partial LSE analysis & store removal" A ScopedArenaAllocator in a single test was accidentally loaded using operator new which is not supported. This caused a memory leak. This reverts commit fe270426c8a2a69a8f669339e83b86fbf40e25a1. This unreverts commit bb6cda60e4418c0ab557ea4090e046bed8206763. Bug: 67037140 Reason for revert: Fixed memory leak in LoadStoreAnalysisTest.PartialEscape test case Test: SANITIZE_HOST=address ASAN_OPTIONS=detect_leaks=0 m test-art-host-gtest-dependencies Run art_compiler_tests Change-Id: I34fa2079df946ae54b8c91fa771a44d56438a719 --- libartbase/base/array_slice.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'libartbase/base/array_slice.h') diff --git a/libartbase/base/array_slice.h b/libartbase/base/array_slice.h index 4679146ca1..a58ff4439d 100644 --- a/libartbase/base/array_slice.h +++ b/libartbase/base/array_slice.h @@ -17,6 +17,7 @@ #ifndef ART_LIBARTBASE_BASE_ARRAY_SLICE_H_ #define ART_LIBARTBASE_BASE_ARRAY_SLICE_H_ +#include #include "bit_utils.h" #include "casts.h" #include "iteration_range.h" @@ -63,6 +64,10 @@ class ArraySlice { lpa != nullptr && lpa->size() != 0 ? &lpa->At(0, element_size, alignment) : nullptr, lpa != nullptr ? lpa->size() : 0, element_size) {} + ArraySlice(const ArraySlice&) = default; + ArraySlice(ArraySlice&&) = default; + ArraySlice& operator=(const ArraySlice&) = default; + ArraySlice& operator=(ArraySlice&&) = default; // Iterators. iterator begin() { return iterator(&AtUnchecked(0), element_size_); } @@ -166,6 +171,19 @@ class ArraySlice { size_t element_size_; }; +template +std::ostream& operator<<(std::ostream& os, const ArraySlice& ts) { + bool first = true; + os << "["; + for (const T& t : ts) { + if (!first) { os << ", "; } + first = false; + os << t; + } + os << "]"; + return os; +} + } // namespace art #endif // ART_LIBARTBASE_BASE_ARRAY_SLICE_H_ -- cgit v1.2.3-59-g8ed1b