Generalize Valgrind annotations in ART to support ASan.
Also add redzones around non-fixed mem_map(s).
Also extend -Wframe-larger-than limit to enable arm64 ASan build.
Change-Id: Ie572481a25fead59fc8978d2c317a33ac418516c
diff --git a/runtime/utils_test.cc b/runtime/utils_test.cc
index 66e38b1..f00edff 100644
--- a/runtime/utils_test.cc
+++ b/runtime/utils_test.cc
@@ -26,7 +26,7 @@
#include "scoped_thread_state_change.h"
#include "handle_scope-inl.h"
-#include <valgrind.h>
+#include "base/memory_tool.h"
namespace art {
@@ -358,7 +358,7 @@
command.push_back("/usr/bin/id");
}
std::string error_msg;
- if (RUNNING_ON_VALGRIND == 0) {
+ if (!(RUNNING_ON_MEMORY_TOOL && kMemoryToolDetectsLeaks)) {
// Running on valgrind fails due to some memory that leaks in thread alternate signal stacks.
EXPECT_TRUE(Exec(command, &error_msg));
}
@@ -372,7 +372,7 @@
std::vector<std::string> command;
command.push_back("bogus");
std::string error_msg;
- if (RUNNING_ON_VALGRIND == 0) {
+ if (!(RUNNING_ON_MEMORY_TOOL && kMemoryToolDetectsLeaks)) {
// Running on valgrind fails due to some memory that leaks in thread alternate signal stacks.
EXPECT_FALSE(Exec(command, &error_msg));
EXPECT_NE(0U, error_msg.size());