summaryrefslogtreecommitdiffstats
path: root/runtime/jit
diff options
context:
space:
mode:
authorRoland Levillain <rpl@google.com>2018-05-24 13:19:05 +0000
committerRoland Levillain <rpl@google.com>2018-06-11 14:03:37 +0100
commit05e34f4cb8c9db165d1008721e874b9dd3db024b (patch)
treec41d397ef5cfb9d7918fceadcda3195a0d0d91de /runtime/jit
parent428d80e3a49f732b39bb0c71cfde26451e3fdf4d (diff)
downloadart-05e34f4cb8c9db165d1008721e874b9dd3db024b.tar.gz
art-05e34f4cb8c9db165d1008721e874b9dd3db024b.tar.bz2
art-05e34f4cb8c9db165d1008721e874b9dd3db024b.zip
Revert^2 "Remove support for Valgrind in ART."
- Disable test configuration art-gtest-valgrind64 (art-gtest-valgrind32 was already disabled). - Remove Makefile logic regarding testing with Valgrind. - Remove occurrences of `TEST_DISABLED_FOR_MEMORY_TOOL_VALGRIND`. - Replace occurrences of `TEST_DISABLED_FOR_MEMORY_TOOL_ASAN` with `TEST_DISABLED_FOR_MEMORY_TOOL`. - Replace the potentially dynamically evaluated `RUNNING_ON_MEMORY_TOOL` expression with constant `kRunningOnMemoryTool`. - Simplify and fold the logic of `art::ArenaAllocatorMemoryToolCheckImpl` and `art::ArenaAllocatorMemoryToolCheck` into `art::ArenaAllocatorMemoryTool`. - Adjust comments regarding memory tools. - Remove Valgrind suppression files. - Remove `--callgrind` option from tools/art. This reverts commit 8b362a87d52a6668ffd2283ef6ffc274315f41c8. Change-Id: I23c76845e6ccf766f19b22b58a0d5161f60842a9 Test: art/test.py Test: art/test/testrunner/run_build_test_target.py art-asan Bug: 77856586 Bug: 29282211
Diffstat (limited to 'runtime/jit')
-rw-r--r--runtime/jit/jit.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc
index b7b779ce31..f31a24ec2a 100644
--- a/runtime/jit/jit.cc
+++ b/runtime/jit/jit.cc
@@ -333,7 +333,7 @@ void Jit::DeleteThreadPool() {
}
// When running sanitized, let all tasks finish to not leak. Otherwise just clear the queue.
- if (!RUNNING_ON_MEMORY_TOOL) {
+ if (!kRunningOnMemoryTool) {
pool->StopWorkers(self);
pool->RemoveAllTasks(self);
}