Revert^2 "ART: Fix breaking changes from recent VIXL update."
This reverts commit eeaf47f7c9bbad29afab84a0f199a5751d9c616b.
Also fixes the gtest failure when VIXL simulator stack
was overflown.
Test: test-art-target, test-art-host.
Test: ART_USE_READ_BARRIER=false \
SANITIZE_HOST=address \
ASAN_OPTIONS='detect_leaks=0' \
SOONG_ALLOW_MISSING_DEPENDENCIES=true \
ART_HEAP_POISONING=true m test-art-host-gtest
Change-Id: Ibc1f21204940083879f767d6993127bdde8326af
diff --git a/compiler/optimizing/intrinsics_arm64.cc b/compiler/optimizing/intrinsics_arm64.cc
index ee2fbd9..aa641e8 100644
--- a/compiler/optimizing/intrinsics_arm64.cc
+++ b/compiler/optimizing/intrinsics_arm64.cc
@@ -3082,16 +3082,16 @@
static void GenIsInfinite(LocationSummary* locations,
bool is64bit,
MacroAssembler* masm) {
- Operand infinity;
- Operand tst_mask;
+ Operand infinity(0);
+ Operand tst_mask(0);
Register out;
if (is64bit) {
- infinity = kPositiveInfinityDouble;
+ infinity = Operand(kPositiveInfinityDouble);
tst_mask = MaskLeastSignificant<uint64_t>(63);
out = XRegisterFrom(locations->Out());
} else {
- infinity = kPositiveInfinityFloat;
+ infinity = Operand(kPositiveInfinityFloat);
tst_mask = MaskLeastSignificant<uint32_t>(31);
out = WRegisterFrom(locations->Out());
}