Revert "Remove support for Valgrind in ART."
This reverts commit 8268cb677bd92bfbcfec7e803775c29687494e53.
Reason for revert: ASAN failures
Change-Id: I7e66d3f3fb461ae4f6dea6ec7d506b7dface3402
Test: SANITIZE_HOST=address m test-art-host
Bug: 77856586
Bug: 29282211
diff --git a/compiler/dex/inline_method_analyser.cc b/compiler/dex/inline_method_analyser.cc
index fe8b766..dc044c1 100644
--- a/compiler/dex/inline_method_analyser.cc
+++ b/compiler/dex/inline_method_analyser.cc
@@ -724,8 +724,7 @@
return false;
}
DCHECK_GE(field->GetOffset().Int32Value(), 0);
- // Historical note: We made sure not to interleave function calls with bit field writes to
- // placate Valgrind. Bug: 27552451.
+ // Do not interleave function calls with bit field writes to placate valgrind. Bug: 27552451.
uint32_t field_offset = field->GetOffset().Uint32Value();
bool is_volatile = field->IsVolatile();
result->field_idx = field_idx;
diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc
index 6e618f4..ca84d42 100644
--- a/compiler/optimizing/instruction_simplifier.cc
+++ b/compiler/optimizing/instruction_simplifier.cc
@@ -636,8 +636,8 @@
return;
}
- // Historical note: The `outcome` was initialized to please Valgrind - the compiler can reorder
- // the return value check with the `outcome` check, b/27651442.
+ // Note: The `outcome` is initialized to please valgrind - the compiler can reorder
+ // the return value check with the `outcome` check, b/27651442 .
bool outcome = false;
if (TypeCheckHasKnownOutcome(check_cast->GetTargetClassRTI(), object, &outcome)) {
if (outcome) {
@@ -682,8 +682,8 @@
return;
}
- // Historical note: The `outcome` was initialized to please Valgrind - the compiler can reorder
- // the return value check with the `outcome` check, b/27651442.
+ // Note: The `outcome` is initialized to please valgrind - the compiler can reorder
+ // the return value check with the `outcome` check, b/27651442 .
bool outcome = false;
if (TypeCheckHasKnownOutcome(instruction->GetTargetClassRTI(), object, &outcome)) {
MaybeRecordStat(stats_, MethodCompilationStat::kRemovedInstanceOf);