diff options
| author | 2020-11-01 22:42:43 +0000 | |
|---|---|---|
| committer | 2020-11-16 14:31:54 +0000 | |
| commit | a07de551da5147f3635c665a31f262cf65647118 (patch) | |
| tree | d6f8199cc45ab8b6ef779f97ef0e8f0d04520ef8 /compiler/optimizing/nodes_shared.cc | |
| parent | 4483d2a4ed7e6c018e304c234484940ec0476039 (diff) | |
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
Diffstat (limited to 'compiler/optimizing/nodes_shared.cc')
| -rw-r--r-- | compiler/optimizing/nodes_shared.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/nodes_shared.cc b/compiler/optimizing/nodes_shared.cc index 2f971b93a6..eca97d7a70 100644 --- a/compiler/optimizing/nodes_shared.cc +++ b/compiler/optimizing/nodes_shared.cc @@ -21,7 +21,7 @@ #include "nodes_shared.h" -#include "common_arm64.h" +#include "instruction_simplifier_shared.h" namespace art { |